[jboss-cvs] JBossAS SVN: r106977 - projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark.

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

Author: kabir.khan at jboss.com
Date: 2010-07-21 09:36:40 -0400 (Wed, 21 Jul 2010)
New Revision: 106977

Modified:
   projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/ClassPathElementInfo.java
Log:
Resolve conflicts github/svn

Modified: projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/ClassPathElementInfo.java
===================================================================
--- projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/ClassPathElementInfo.java	2010-07-21 13:01:24 UTC (rev 106976)
+++ projects/cl-benchmark/trunk/src/test/java/org/jboss/test/cl/benchmark/ClassPathElementInfo.java	2010-07-21 13:36:40 UTC (rev 106977)
@@ -82,5 +82,4 @@
    {
       return importedJars;
    }
-
 }