|
|
@@ -1,23 +1,8 @@
|
|
|
-<<<<<<< HEAD
|
|
|
-<?xml version="1.0" encoding="UTF-8"?>
|
|
|
-<classpath>
|
|
|
- <classpathentry kind="src" path="src"/>
|
|
|
- <classpathentry kind="src" path="res"/>
|
|
|
- <classpathentry excluding="src/|res/" kind="src" path=""/>
|
|
|
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
|
|
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
|
|
- <classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
|
|
|
- <classpathentry kind="output" path="bin"/>
|
|
|
-</classpath>
|
|
|
-=======
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<classpath>
|
|
|
- <classpathentry kind="src" path="src"/>
|
|
|
- <classpathentry kind="src" path="res"/>
|
|
|
- <classpathentry excluding="src/|res/" kind="src" path=""/>
|
|
|
+ <classpathentry kind="src" path=""/>
|
|
|
+ <classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
|
|
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
|
|
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
|
|
|
- <classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
|
|
|
<classpathentry kind="output" path="bin"/>
|
|
|
</classpath>
|
|
|
->>>>>>> branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons.git
|
