--- incidenceeditor-ng/tests/CMakeLists.txt	2012-01-24 09:25:32.302001749 +0800
+++ incidenceeditor-ng/tests/CMakeLists.txt	2012-01-24 09:34:18.779001935 +0800
@@ -19,7 +19,6 @@ 
 ENDMACRO(IE_EXECUTABLE_TESTS)
 
 IE_UNIT_TESTS(
-  conflictresolvertest
   testfreebusyitemmodel
   testfreeperiodmodel
   testfreebusyganttproxymodel