手动合并代码

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -778,11 +778,7 @@ namespace GFGGame
             if(zcjbCfg != null)
             {
                 _ui.m_btnActivityZCJB.m_iconMain.url = ResPathUtil.GetActivityPath(zcjbCfg.res, "png");
-<<<<<<< HEAD
             }  
-=======
-            }   
->>>>>>> remotes/org/dev
         }
 
         private void UpdateOpenServerActivity()