Merge remote-tracking branch 'origin/master'

travellings-link · May 19, 2020 · dd62ada · dd62ada · vercel · May 19, 2020
2 parents 04f1914 + 6953949
commit dd62ada
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -176,7 +176,10 @@
 | 101 | 底栏 | Chr_小屋 | https://blog.chrxw.com |
 | 102 | 侧栏 | 土豆和豌豆 | https://www.luxinzhangyun.top |
 | 103 | 顶栏 | tabris的遥远星系 | https://www.tabirstrees.top |
+<<<<<<< HEAD
 | 104 | 侧栏 | 728004090博客 | https://www.googlessr.top |
+=======
+>>>>>>> master
 
 
 

diff --git a/assets/travelling.js b/assets/travelling.js
@@ -105,11 +105,18 @@ function travelling(){
     url[101]="https://blog.chrxw.com";
     url[102]="https://www.luxinzhangyun.top";
     url[103]="https://www.tabirstrees.top";
+<<<<<<< HEAD
     url[104]="https://www.googlessr.top";
 
 
       //修正概率
     url[105]="https://github.com/volfclub/travelling";
+=======
+
+
+      //修正概率
+    url[104]="https://github.com/volfclub/travelling";
+>>>>>>> master
 
 
     var ints=parseInt(Math.random()*(url.length));