--- trunk/finley/test/python/runbenchmark.py	2007/03/19 03:50:34	1042
+++ trunk/finley/benchmarks/runbenchmark.py	2007/03/20 02:52:24	1046
@@ -22,7 +22,7 @@
 __version__="$Revision:$"
 __date__="$Date:$"
 
-from esys.finley.finleybench import *
+from finleybench import *
 from esys.escript.benchmark import BenchmarkSuite,Benchmark
 
 type="all" 
@@ -1094,7 +1094,6 @@
    bms.addBenchmark(bm_CLA3D_o2_c2)
    bms.addBenchmark(bm_CLA3D_o2_c2_n45)
    
->>>>>>> .r489
 bms.run(scale=thlist)
 out=bms.getHTML(filter=ff)
 print out