From b41fb3af4176c83552a789c3c02e18b7574b3f42 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Wed, 18 Oct 2017 16:40:53 -0700
Subject: [PATCH] Cleanup junk from merge conflict that was missed

---
 .../java/requestmapping/test/RequestMappingLiveHoverTest.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git 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
index c89fb3417..ed4ddcd28 100644
--- 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