fix merge error

aol · Apr 21, 2015 · 63a5572 · 63a5572
1 parent 9ab1134
commit 63a5572
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/micro-boot/build.gradle b/micro-boot/build.gradle
@@ -5,11 +5,8 @@ dependencies {
 	compile 'org.springframework.boot:spring-boot:1.2.1.RELEASE'
 	compile 'org.springframework.boot:spring-boot-autoconfigure:1.2.1.RELEASE'
 	//compile project(':micro-core')
-<<<<<<< HEAD
 	 compile group: 'com.aol.microservices', name:'microserver-core', version:'0.55'
-=======
-	 compile group: 'com.aol.microservices', name:'microserver-core', version:'0.54'
->>>>>>> 3521be673c00ffe96533acc6ff62127cc80bc0a7
+
 
 }