From c518221f6b6d11da83b686445f54d702c35a3d3e Mon Sep 17 00:00:00 2001
From: AlexTheCoder <alexjmeech@gmail.com>
Date: Mon, 2 Nov 2015 22:14:48 -0500
Subject: [PATCH] - Fix Merge Error

---
 Plugins/Mineplex.StaffServer/.classpath | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Plugins/Mineplex.StaffServer/.classpath b/Plugins/Mineplex.StaffServer/.classpath
index 4359d3d30..52e5e02bf 100644
--- a/Plugins/Mineplex.StaffServer/.classpath
+++ b/Plugins/Mineplex.StaffServer/.classpath
@@ -11,10 +11,6 @@
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
 	<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/gson-2.2.1.jar"/>
-<<<<<<< HEAD
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-=======
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_65"/>
->>>>>>> 8838ea75e400c6114ef8ba81071411842c12652e
 	<classpathentry kind="output" path="bin"/>
 </classpath>