fix gitignore

wwr · wwr · commit 0154e9dafcbd · 2020-09-30T17:34:37.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -7,17 +7,3 @@ target/
 .classpath
 .project
 
-<<<<<<< HEAD
-.gitignore-sohu
-cachecloud-custom-sohu/
-cachecloud-client/*/src/test/*
-cachecloud-web/src/test/*
-*application-local-sohu.yml
-*application-test-sohu.yml
-*application-online-sohu.yml
-*bootstrap.yml
-*Jenkinsfile
-=======
-
->>>>>>> master
-
