From f93112f8794d0d5fbedc3b1adff804fbe73fbc0f Mon Sep 17 00:00:00 2001
From: koko <volfclub@aliyun.com>
Date: Tue, 19 May 2020 20:16:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md            | 3 ---
 assets/travelling.js | 7 -------
 2 files changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 660d6f5bf..70ae55f79 100644
--- a/README.md
+++ b/README.md
@@ -176,10 +176,7 @@
 | 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
index c7627a789..5c1f8f80f 100644
--- a/assets/travelling.js
+++ b/assets/travelling.js
@@ -105,18 +105,11 @@ 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));