Index: shared/scripts/configuration/config.py
===================================================================
diff -u -r832ebd77e926ca21aba6b238ef0b329acb7c7288 -r4e47f864a889d68594f076d825f54903e45b941a
--- shared/scripts/configuration/config.py	(.../config.py)	(revision 832ebd77e926ca21aba6b238ef0b329acb7c7288)
+++ shared/scripts/configuration/config.py	(.../config.py)	(revision 4e47f864a889d68594f076d825f54903e45b941a)
@@ -677,6 +677,7 @@
 FAIL_TEXT = "FAIL"
 OK_TEXT = "OK"
 
+<<<<<<< HEAD
 # pretreatment_patient_connection
 SYSTOLIC_PRESSSURE_120 = 120
 SYSTOLIC_PRESSSURE_113 = 113
@@ -730,4 +731,13 @@
     "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0},
     }
 
+#pretreatment_screen_bullets
+PRE_TREATMENT_SCREENS = ["Create" , "Sample" , "Consumables" , "Disposables" , "Prime" , "Ultrafiltration" , "BP/HR" , "Connection" , "Start"]
 
+CURRENT_COLOR = '#000000'                            
+COMPLETE_COLOR=  '#4290ec'
+ENABLED_COLOR = '#fcfcfc'                           
+INCOMPLETE_COLOR =  '#607a91' 
+
+
+