Cleanup junk from merge conflict that was missed

2017-10-18 16:40:53 -07:00
parent 93dce1f334
commit b41fb3af41
1 changed files with 0 additions and 1 deletions
--- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
+++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java
@@ -135,4 +135,3 @@ public class RequestMappingLiveHoverTest {
 	}

 }
->>>>>>> 8b2f3de69a7f6b93701a8c831b06d3fb7b614518