u

9552a2b7 · wildfirecode13 · db4c63c5 · 9552a2b7
Commit 9552a2b7 authored Aug 13, 2021 by wildfirecode13
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

IndexScene.ts project/src/scenes/IndexScene.ts +0 -5

No files found.
--- a/project/src/scenes/IndexScene.ts
+++ b/project/src/scenes/IndexScene.ts
@@ -31,13 +31,8 @@ export class IndexScene extends Scene {
    
    start() {
        super.start();
-<<<<<<< HEAD
        this.getIndex();
        // showPanel(SharePanel);
-=======
-
-        showPanel(PrizePanel);
->>>>>>> 4445b545174f45bdb5de86ca86be78b8f149ecec
        getObject(this,'index_sharetips').visible=false;
        this.initContainer();
        this.initmask();