本地改好了

SamSandoz · SamSandoz · commit 62dd797abbf7 · 2017-05-06T13:04:47.000+08:00
diff --git a/src/main/java/com/example/Application.java b/src/main/java/com/example/Application.java
@@ -10,11 +10,7 @@ public class Application {
 	
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
-<<<<<<< HEAD
 		int fff=2;
-=======
-		int a=2;
->>>>>>> branch 'master' of https://github.com/FnuJava/spring-boot.git
 		System.out.println(1);
 	}
 	
