Commits

zcx  committed 9e80922 Merge

fix

  • Participants
  • Parent commits 85ee274, 5eadfa8

Comments (0)

Files changed (3)

File css/_hash_.py

 import _env
 
 __HASH__ =  {
+<<<<<<< local
     "reset.css" : '4yUW2pgRTE8SngskVbqJRQ.css', #reset
     "history.css" : 'dz1pTmLBl2PxHHBYVXfBIg.css', #history
     "index.css" : 'PIu7msIjn26bZ5CeHDpLtA.css', #index
+=======
+    "index.css" : 'FL0J2KpmnwFwzjUyEhy3RA.css', #index
+>>>>>>> other
     "base.css" : 'dEnughKoGCBkAXRcphq2pg.css', #base
     "help.css" : 'b4rnmKfIPNYONWS0TO5qyA.css', #help
+    "reset.css" : '4yUW2pgRTE8SngskVbqJRQ.css', #reset
+    "history.css" : 'MOhUiGd4Ea2_ro5f3RaV7A.css', #history
 }
 
 

File js/_hash_.py

 import _env
 
 __HASH__ =  {
+<<<<<<< local
     "index.js" : 'W-bwYSf46yCwkJycp4IpZA.js', #index
+=======
+    "base.js" : 'YF6cB3emWJXHzYXMgpBHZA.js', #base
+    "cookie.js" : '_Lb6EAwJZk7RNUjbJJmXFw.js', #cookie
+    "index.js" : 'NcWj79NUREwGbNj0wiyojg.js', #index
+    "all.js" : 'WycLqh_xke0gbzSuVgxzkQ.js', #all
+    "history.js" : 'FHTxqtEHu0xrCgEpevJHYA.js', #history
+    "paging.js" : 'HV6PX0oDIW5R2pqlIMActw.js', #paging
+>>>>>>> other
     "ext.js" : 'fYbDzFtJEhehMZhJPy1i6Q.js', #ext
+<<<<<<< local
     "cookie.js" : '_Lb6EAwJZk7RNUjbJJmXFw.js', #cookie
     "base.js" : 'ZmKE7RScKu03QCIA4YVbgQ.js', #base
     "history.js" : 'FHTxqtEHu0xrCgEpevJHYA.js', #history
     "all.js" : 'L7bpd9RsP_cslOgSz1U2mA.js', #all
     "paging.js" : 'HV6PX0oDIW5R2pqlIMActw.js', #paging
+=======
+>>>>>>> other
 }
 
 
 function LOAD(js){ document.write('<script src="'+js+'"></'+"script>") }
-LOAD('http://42qu.cc/js/base.js')
-LOAD('http://42qu.cc/js/ext.js')
-LOAD('http://42qu.cc/js/cookie.js')
+LOAD('http://s.42qu.co/js/base.js')
+LOAD('http://s.42qu.co/js/ext.js')
+LOAD('http://s.42qu.co/js/cookie.js')