[jboss-cvs] JBoss Messaging SVN: r6385 - trunk.

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

Author: timfox
Date: 2009-04-09 14:19:44 -0400 (Thu, 09 Apr 2009)
New Revision: 6385

Modified:
   trunk/.classpath
Log:
fixed classpath for eclipse

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2009-04-09 18:13:35 UTC (rev 6384)
+++ trunk/.classpath	2009-04-09 18:19:44 UTC (rev 6385)
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
-<<<<<<< .mine
 	<classpathentry kind="src" path="tests/jms-tests/config"/>
-=======
-	<classpathentry kind="src" path="examples/jms/message-priority/src"/>
->>>>>>> .r6382
-	<classpathentry kind="src" path="examples/jms/queue-selector/src"/>
 	<classpathentry kind="src" path="build/src"/>
 	<classpathentry kind="src" path="tests/config"/>
 	<classpathentry kind="src" path="src/config"/>
@@ -19,6 +14,8 @@
 	<classpathentry kind="src" path="src/schemas"/>
 	<classpathentry kind="src" path="tests/joram-tests/src"/>
 	<classpathentry kind="src" path="tests/joram-tests/config"/>
+	<classpathentry kind="src" path="examples/jms/queue-selector/src"/>
+	<classpathentry kind="src" path="examples/jms/message-priority/src"/>
 	<classpathentry kind="src" path="examples/jms/automatic-failover/src"/>
 	<classpathentry kind="src" path="examples/jms/clustered-queue/src"/>
 	<classpathentry kind="src" path="examples/jms/clustered-topic/src"/>