From 52876ecb1675560e473485500e337c39f6409ad7 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Thu, 15 Jan 2015 10:07:51 -0800
Subject: [PATCH] Fix merge

---
 interface/src/Menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index df4014cd77..ac1aa5ed53 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1060,7 +1060,7 @@ void Menu::bookmarkLocation() {
         return;
     }
 
-    AddressManager::SharedPointer addressManager = DependencyManager::get<AddressManager>();
+    auto addressManager = DependencyManager::get<AddressManager>();
     QString bookmarkAddress = addressManager->currentAddress().toString();
 
     Bookmarks* bookmarks = Application::getInstance()->getBookmarks();