[jboss-svn-commits] JBL Code SVN: r34250 - labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests.

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

Author: jervisliu
Date: 2010-07-28 07:28:29 -0400 (Wed, 28 Jul 2010)
New Revision: 34250

Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
Log:
fixed compile error

Modified: labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-07-28 11:17:04 UTC (rev 34249)
+++ labs/jbossrules/soa_branches/BRMS-5.0.x/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java	2010-07-28 11:28:29 UTC (rev 34250)
@@ -36,11 +36,8 @@
 import org.drools.io.ResourceFactory;
 import org.drools.lang.descr.PackageDescr;
 import org.drools.rule.Package;
-<<<<<<< .working
 import org.drools.runtime.StatefulKnowledgeSession;
-=======
 import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
->>>>>>> .merge-right.r33452
 
 public class AccumulateTest extends TestCase {
     protected RuleBase getRuleBase() throws Exception {