Index: suite.conf
===================================================================
diff -u -rb575f65fdac844229ace1dab1b00ffba231a1314 -ra23188eea2674e4482b9c7741c0d4fc718a05863
--- suite.conf	(.../suite.conf)	(revision b575f65fdac844229ace1dab1b00ffba231a1314)
+++ suite.conf	(.../suite.conf)	(revision a23188eea2674e4482b9c7741c0d4fc718a05863)
@@ -5,10 +5,6 @@
 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_ultrafiltration tst_main_treatment_heparin tst_pre_treatment_priming pre_treatment_disposables pre_treatment_patient_connection tst_unhandled_message_log tst_instructions_poc tst_service_screen tst_cloud_sync_device_registration tst_rinseback_setup tst_recirculate tst_settings_information tst_cloud_sync - treatment_screen
-=======
-TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment tst_dialin_logs
->>>>>>> dialin_log
+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_ultrafiltration tst_main_treatment_heparin tst_pre_treatment_priming pre_treatment_disposables pre_treatment_patient_connection tst_unhandled_message_log tst_instructions_poc tst_service_screen tst_cloud_sync_device_registration tst_rinseback_setup tst_recirculate tst_settings_information tst_cloud_sync - treatment_screen tst_In_treatment tst_dialin_logs
 VERSION=3
 WRAPPERS=Qt