5555

FnuJava · FnuJava · commit 32befed82a36 · 2017-05-07T14:28:57.000+08:00
diff --git a/src/main/java/com/example/Application.java b/src/main/java/com/example/Application.java
@@ -10,12 +10,7 @@ public class Application {
 	
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
-<<<<<<< HEAD
-		int abc6=2;		
-=======
-		int abc5=2;		
->>>>>>> branch 'master' of https://github.com/FnuJava/spring-boot.git
-		int abc3=2;
+		int abc3=5;
 		System.out.println(1);
 	}
 	
