1

6141a8b0 · wildfirecode · d8e01efd · 6141a8b0
Commit 6141a8b0 authored Dec 10, 2019 by wildfirecode
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Main.ts egret/src/Main.ts +0 -4

No files found.
--- a/egret/src/Main.ts
+++ b/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();