1

egret/src/Main.ts

@@ -178,11 +178,7 @@ class Main extends MainBase {
                         // ToastCtrl.instance.show("网络异常请重试~");
                         return;
                     }
-<<<<<<< HEAD
-                }, window['projectId'], GameConst.getQueryString("InviteSource"))
-=======
                 }, window['projectId'])
->>>>>>> 26f44727bfa8821e2c36195a724c08dcc554fd36
             // }
             Waiting.instance.hide();