[jboss-cvs] JBossAS SVN: r110707 - projects/jboss-jca/trunk/core.

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

Author: jeff.zhang
Date: 2011-02-17 21:33:23 -0500 (Thu, 17 Feb 2011)
New Revision: 110707

Modified:
   projects/jboss-jca/trunk/core/.classpath
Log:
quick fix .classpath for core component

Modified: projects/jboss-jca/trunk/core/.classpath
===================================================================
--- projects/jboss-jca/trunk/core/.classpath	2011-02-18 02:20:25 UTC (rev 110706)
+++ projects/jboss-jca/trunk/core/.classpath	2011-02-18 02:33:23 UTC (rev 110707)
@@ -23,8 +23,6 @@
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jbossjts-integration.jar"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/jbossjts.jar"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/common/picketbox.jar"/>
-<<<<<<< HEAD
-=======
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-impl-base.jar"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-junit.jar" sourcepath="/dati/project/RH/arquillian/impl-base/src/main/java"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-api.jar"/>
@@ -43,6 +41,5 @@
 	<classpathentry kind="lib" path="/ironjacamar-parent/lib/arquillian/arquillian-testenricher-resource.jar"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/target/ironjacamar-deployers-common.jar"/>
 	<classpathentry kind="lib" path="/ironjacamar-parent/target/ironjacamar-deployers-fungal.jar"/>
->>>>>>> testSubjectFactory
 	<classpathentry kind="output" path="eclipse-target/classes"/>
 </classpath>