- Fix Merge Error
This commit is contained in:
parent
c41d01e213
commit
c518221f6b
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user