From 67c9a33cc0a0b57d79d957adb176c56976dbe68e Mon Sep 17 00:00:00 2001
From: "Kevin M. Thomas" <kevin@kevintown.net>
Date: Fri, 24 Jul 2015 15:16:02 -0400
Subject: [PATCH] Update Menu.cpp

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

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index d5f4d78f5b..91ae6a4d02 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -487,14 +487,10 @@ Menu::Menu() {
 #endif
 
     MenuWrapper* networkMenu = developerMenu->addMenu("Network");
-<<<<<<< HEAD
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
-    addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false);
-=======
     addCheckableActionToQMenuAndActionHash(networkMenu, MenuOption::DisableNackPackets, 0, false,
                                            qApp->getEntityEditPacketSender(),
                                            SLOT(toggleNackPackets()));
->>>>>>> f3dc159e336b7b580bbd39b367802b0099e66ccb
     addCheckableActionToQMenuAndActionHash(networkMenu,
                                            MenuOption::DisableActivityLogger,
                                            0,