From e68f149aac64f4197ef891ced260e33af66e4d11 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 21 Apr 2015 13:18:53 -0700
Subject: [PATCH] Fixing bad 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 84c810ac0d..259b71afc2 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -245,7 +245,7 @@ Menu::Menu() {
                                            false,
                                            qApp,
                                            SLOT(setFullscreen(bool)));
-#endif
+
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, 
         0, // QML Qt::Key_P, 
         true, qApp, SLOT(cameraMenuChanged()));