--- a/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp Fri May 14 16:24:46 2010 +0300
+++ b/vmbx/vmbxcpplugin/tsrc/src/ut_vmbxcpplugin.cpp Thu May 27 13:23:05 2010 +0300
@@ -45,6 +45,12 @@
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;
@@ -54,5 +60,6 @@
QVERIFY(group);
delete group;
group = NULL;
+>>>>>>> e:\ec_temp\ut_vmbxcpplugin-2.cpp
}
//End of file