Merge branch 'master' of https://github.com/backkoms/simplemall.git

Conflicts: base-serv/sleuth-server/pom.xml base-serv/sleuth-server/src/main/java/com/simplemall/micro/serv/base/zipkin/SleuthServerApplicaton.java base-serv/sleuth-server/src/main/resources/application.properties
GGLL · Aug 14, 2017 · 4989250 · 4989250
2 parents 5f00300 + d7da30d
commit 4989250
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/base-serv/sleuth-server/pom.xml b/base-serv/sleuth-server/pom.xml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
@@ -61,4 +62,17 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+=======
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.simplemall.micro.serv.base</groupId>
+    <artifactId>base-serv</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>com.simplemall.micro.serv.base.zipkin</groupId>
+  <artifactId>sleuth-server</artifactId>
+  <name>sleuthServer</name>
+  <description>链路跟踪服务</description>
+>>>>>>> branch 'master' of https://github.com/backkoms/simplemall.git
 </project>