ソースを参照

classpath fix

Jessey Widhalm 8 年 前
コミット
2ca8fddb52
1 ファイル変更8 行追加11 行削除
  1. 8 11
      .classpath

+ 8 - 11
.classpath

@@ -1,14 +1,11 @@
 <?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="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"/>
-<<<<<<< HEAD
-	<classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
-=======
->>>>>>> 94ac30ff10997d71d29da84704769fc19280ef6a
-	<classpathentry kind="output" path="bin"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="res"/>
+        <classpathentry excluding="src/|res/" 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="output" path="bin"/>
 </classpath>
+