Index: suite.conf
===================================================================
diff -u -re2c7e8c3ff84e22b6480ddbb52e52a32bdba16b5 -r4798b078bb6825fd693921aa54f636741cff0051
--- suite.conf	(.../suite.conf)	(revision e2c7e8c3ff84e22b6480ddbb52e52a32bdba16b5)
+++ suite.conf	(.../suite.conf)	(revision 4798b078bb6825fd693921aa54f636741cff0051)
@@ -4,6 +4,10 @@
 IMPLICITAUTSTART=0
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
+<<<<<<< HEAD
+TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment tst_main_treatment_pressure tst_treatment_blood_dialysateflow_rate tst_main_treatment_vitals tst_ui_alarms_list tst_ui_alarms_dialog tst_main_treatment_ultrafilteration
+=======
 TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment
+>>>>>>> origin/diality_initialization_screen
 VERSION=3
 WRAPPERS=Qt