Resolve a few unresolved merge conflicts.

2 files changed, 0 insertions, 18 deletions

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;