1 files changed, 0 insertions, 6 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;