From a624ff43c4c891b179be56e6b159b3d3a2f421f7 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 16 Apr 2015 14:10:29 -0700
Subject: [PATCH] Nothing to see here, move along

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

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index aa24c8ca2c..5d02cf9094 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -251,7 +251,6 @@ Menu::Menu() {
                                            qApp,
                                            SLOT(setFullscreen(bool)));
 #endif
-<<<<<<< HEAD
     addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, 
         0, // QML Qt::Key_P, 
         true, qApp, SLOT(cameraMenuChanged()));