Merge branch 'master' of http://101.36.160.140:21044/depot-shanxi/depot-eureka-shanxi

# Conflicts:
#	.gitignore
#	README.md

.gitignore

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 log
 .idea
 *.iml
@@ -9,6 +10,8 @@ log
 /log/
 .settings
 =======
+=======
+>>>>>>> fcf5118f9b1afbb845fb8a8d2a42391627b1ef1c
 # ---> Java
 *.class
 
@@ -23,4 +26,7 @@ log
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+<<<<<<< HEAD
 >>>>>>> 5228917df4d1b95b1f3713791d7ff219b3467b41
+=======
+>>>>>>> fcf5118f9b1afbb845fb8a8d2a42391627b1ef1c

README.md

@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 ## spring-cloud-eureka-server
 
 这是一个公共的服务注册中心项目
@@ -12,3 +13,8 @@
 
 云南注册中心
 >>>>>>> 5228917df4d1b95b1f3713791d7ff219b3467b41
+=======
+# depot-eureka-shanxi
+
+注册中心初始化--山西项目
+>>>>>>> fcf5118f9b1afbb845fb8a8d2a42391627b1ef1c