--- a/tests/benchmarks/corelib/io/qdir/qdir.pro	Fri Apr 16 15:50:13 2010 +0300
+++ b/tests/benchmarks/corelib/io/qdir/qdir.pro	Mon May 03 13:17:34 2010 +0300
@@ -1,13 +1,2 @@
-<<<<<<< HEAD
-load(qttest_p4)
-TEMPLATE = app
-TARGET = tst_bench_qdir
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-SOURCES += tst_qdir.cpp
-=======
 TEMPLATE = subdirs
 SUBDIRS  = 10000
->>>>>>> qt-master/4.6