Update README.md

lezsk · Aug 17, 2018 · b2cf0fa · b2cf0fa
1 parent 4695b08
commit b2cf0fa
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,4 @@
 # V2ray.Fun
-<<<<<<< HEAD
-## 推荐使用Debian系列系统
-### 一键安装
-=======
 
 ## 简介
 
@@ -28,7 +24,5 @@
 ## 一键安装
 
 目前处于测试阶段，不保证一键脚本能安装成功
-
->>>>>>> 3057f822f52a7be3221b33d989940d31d54bfc97
 > wget -N --no-check-certificate https://raw.githubusercontent.com/FunctionClub/V2ray.Fun/master/install.sh && bash install.sh