1

f52edc3f · 邱旭 · dfedb06a · f52edc3f
Commit f52edc3f authored Oct 11, 2019 by 邱旭
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

index.html egret/index.html +0 -4

No files found.
--- a/egret/index.html
+++ b/egret/index.html
@@ -48,7 +48,6 @@
    <script src="libs/pad-zeropadding.js"></script>
    <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
    <script>
-<<<<<<< HEAD
        /*
         * 邀请有礼分享
         */
@@ -100,9 +99,6 @@
        }
    </script>
    <script>
-=======
-    //    window.isInvitePage = 1;
->>>>>>> 0a4b334dc0c6f0151f4a6f5714102d247466ff04
       window['signconfigs'] =   [
            { nums: '0.15元', type: 'quan15' },
            { nums: '*1', type: 'hammer' },