Update ValidationService.java

src/main/java/service/ValidationService.java

@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 package service;
 
 /**
@@ -34,9 +34,5 @@ public class ValidationService {
     public String extractTypeFromCommand(String command) {
         return command.replace("切换为", "");
     }
-=======
-package main.java.service;
 
-public class ValidationService {
->>>>>>> 93d8b771666e4fb2ee7477c19dcf6f4fb1eec045
 }