--- a/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp	Thu May 27 13:23:05 2010 +0300
+++ b/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp	Fri Jun 11 14:07:16 2010 +0300
@@ -45,21 +45,9 @@
 void Ut_vmbxCpPlugin::testCreateVmbxCpGroup()
 {
     CpItemDataHelper itemDataHelper;
-<<<<<<< e:\ec_temp\ut_vmbxcpplugin-e003sa18#2.cpp
     VmbxCpGroup *group = new VmbxCpGroup(itemDataHelper);
     QVERIFY(group);
     delete group;
     group = NULL;
-=======
-    VmbxCpGroup *group = new VmbxCpGroup(itemDataHelper);
-    QVERIFY(group);
-    delete group;
-    group = NULL;
-    
-    group = new VmbxCpGroup();
-    QVERIFY(group);
-    delete group;
-    group = NULL;
->>>>>>> e:\ec_temp\ut_vmbxcpplugin-2.cpp
 }
 //End of file