correct slip of click in classpath from last commit - I wonder there are 7658'is around

apflemaenchen, please don't take this amiss

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7659 6c8d7289-2bf4-0310-a012-ef5d649a1542

.classpath

@@ -41,13 +41,10 @@
 	<classpathentry kind="lib" path="lib/pdfbox-1.2.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
-<<<<<<< .mine
 	<classpathentry kind="lib" path="lib/json-simple-1.1.jar"/>
-=======
 	<classpathentry kind="lib" path="lib/slf4j-api-1.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-jdk14-1.5.5.jar"/>
 	<classpathentry kind="lib" path="lib/apache-solr-solrj-3.1.0.jar"/>
->>>>>>> .r7657
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-core.jar"/>
 	<classpathentry kind="output" path="gen"/>

addon/YaCy.app/Contents/Info.plist

@@ -64,6 +64,7 @@
 			<string>$JAVAROOT/lib/poi-3.6-20091214.jar</string>
 			<string>$JAVAROOT/lib/poi-scratchpad-3.6-20091214.jar</string>
 			<string>$JAVAROOT/lib/servlet-api.jar</string>
+			<string>$JAVAROOT/lib/json-simple-1.1.jar</string>
 			<string>$JAVAROOT/lib/slf4j-api-1.5.5.jar</string>
 			<string>$JAVAROOT/lib/slf4j-jdk14-1.5.5.jar</string>
 			<string>$JAVAROOT/lib/webcat-0.1-swf.jar</string>