[jboss-cvs] JBossAS SVN: r63194 - trunk/server.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2007-05-24 06:08:40 -0400 (Thu, 24 May 2007)
New Revision: 63194

Modified:
   trunk/server/.classpath
Log:
Fixed merge failure

Modified: trunk/server/.classpath
===================================================================
--- trunk/server/.classpath	2007-05-23 14:22:09 UTC (rev 63193)
+++ trunk/server/.classpath	2007-05-24 10:08:40 UTC (rev 63194)
@@ -39,9 +39,5 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer-src.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/security"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
-<<<<<<< .mine
-	<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
-=======
->>>>>>> .r63187
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>