4 files changed, 4 insertions, 34 deletions
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index 65211bf122..da5d7874c6 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -562,6 +562,8 @@ public:
     // add a context menu branch
     bool appendContextSubMenu(LLMenuGL *menu);
 
+    void createSpilloverBranch();
+    void cleanupSpilloverBranch();
     // Add the menu item to this menu.
     virtual bool append( LLMenuItemGL* item );
 
@@ -806,15 +808,9 @@ public:
     void resetMenuTrigger() { mAltKeyTrigger = false; }
 
     // add a menu - this will create a drop down menu.
-<<<<<<< variant A
-    virtual BOOL appendMenu(LLMenuGL *menu);
+    virtual bool appendMenu(LLMenuGL *menu);
 
 private:
->>>>>>> variant B
-    virtual bool appendMenu( LLMenuGL* menu );
-####### Ancestor
-    virtual BOOL appendMenu( LLMenuGL* menu );
-======= end
     // rearrange the child rects so they fit the shape of the menu
     // bar.
     virtual void arrange( void );
diff --git a/indra/llxml/tests/llcontrol_test.cpp b/indra/llxml/tests/llcontrol_test.cpp
index 4cb66a91fb..52c202bceb 100644
--- a/indra/llxml/tests/llcontrol_test.cpp
+++ b/indra/llxml/tests/llcontrol_test.cpp
@@ -134,16 +134,8 @@ namespace tut
         LLControlGroup test_cg("foo3");
         std::string temp_test_file = (mTestConfigDir + "setting_llsd_persist_temp.xml");
         mCleanups.push_back(temp_test_file);
-<<<<<<< variant A
-        mCG->saveToFile(temp_test_file.c_str(), TRUE);
-        results = test_cg.loadFromFile(temp_test_file);
->>>>>>> variant B
         mCG->saveToFile(temp_test_file.c_str(), true);
-        results = test_cg.loadFromFile(temp_test_file.c_str());
-####### Ancestor
-        mCG->saveToFile(temp_test_file.c_str(), TRUE);
-        results = test_cg.loadFromFile(temp_test_file.c_str());
-======= end
+        results = test_cg.loadFromFile(temp_test_file);
         //If we haven't changed any settings, then we shouldn't have any settings to load
         ensure("number of non-persisted changed settings loaded", (results == 0));
     }
diff --git a/indra/newview/llmediadataclient.h b/indra/newview/llmediadataclient.h
index 736f4d8537..a5e6e43e3f 100644
--- a/indra/newview/llmediadataclient.h
+++ b/indra/newview/llmediadataclient.h
@@ -286,13 +286,7 @@ private:
     {
     public:
         QueueTimer(F32 time, LLMediaDataClient *mdc);
-<<<<<<< variant A
         bool tick() override;
->>>>>>> variant B
-        virtual bool tick();
-####### Ancestor
-        virtual BOOL tick();
-======= end
     private:
         // back-pointer
         LLPointer<LLMediaDataClient> mMDC;
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index ea4a5bfdf1..fb96718d1c 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -364,13 +364,7 @@ public:
     }
 
 
-<<<<<<< variant A
     bool tick() override
->>>>>>> variant B
-    /*virtual*/ bool tick()
-####### Ancestor
-    /*virtual*/ BOOL tick()
-======= end
     {
         if (!mIsActive) return false;
 
@@ -510,13 +504,7 @@ public:
         }
     }
 
-<<<<<<< variant A
     bool tick() override
->>>>>>> variant B
-    /*virtual*/ bool tick()
-####### Ancestor
-    /*virtual*/ BOOL tick()
-======= end
     {
         update();
         return false;