Przeglądaj źródła

update from server

Ubuntu 2 lat temu
rodzic
commit
8634c6021b
1 zmienionych plików z 7 dodań i 1 usunięć
  1. 7
    1
      public/game/monopoly/index_pre.html

public/game/monopoly/index.html → public/game/monopoly/index_pre.html Wyświetl plik

@@ -1,6 +1,7 @@
1 1
 <!doctype html>
2 2
 <html class="🤘🏻rockroll">
3 3
 
4
+<<<<<<< HEAD:public/game/monopoly/index.html
4 5
 <head>
5 6
   <meta http-equiv="PRAGMA" content="NO-CACHE">
6 7
   <meta http-equiv="EXPIRES" content="0">
@@ -53,4 +54,9 @@
53 54
   <script defer="defer" src="assets/js/index.js?feff98bd89603c762f1e"></script>
54 55
 </body>
55 56
 
56
-</html>
57
+</html>
58
+=======
59
+  gtag('config', 'UA-109578440-3');</script><link href="assets/css/vendors-chunk.css?c8b3ea0fbc661c3e7473" rel="stylesheet"><link href="assets/css/index.css?c50702cabadbacdb8d68" rel="stylesheet"></head><body><div id="app"></div><script src="https://cdn.jsdelivr.net/npm/vconsole@3.2.0/dist/vconsole.min.js"></script><script>if (window.location.host === 'declarepre.taiwanpay.com.tw') {
60
+        var vConsole = new VConsole();
61
+      }</script><script charset="utf-8" src="https://static.line-scdn.net/liff/edge/2/sdk.js"></script><script src="https://www.youtube.com/player_api"></script><script src="assets/lib/jquery-3.5.1.min.js"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/3.8.0/gsap.min.js"></script><script src="assets/lib/jquery.cookie-1.4.1.min.js"></script><script src="assets/lib/slick/slick.min.js"></script><script src="assets/js/game/roll-a-die.js"></script><script src="https://code.createjs.com/1.0.0/createjs.min.js"></script><script defer="defer" src="assets/js/vendors-chunk.js?cb4b3920eb99b760cf34"></script><script defer="defer" src="assets/js/index.js?feff98bd89603c762f1e"></script></body></html>
62
+>>>>>>> 7685dc20f5bdc9d20ec28991d24586db983bd3ac:public/game/monopoly/index_pre.html