diff --git a/lib/function.tcl b/lib/function.tcl
index 85ec640..2b4a472 100644
--- a/lib/function.tcl
+++ b/lib/function.tcl
@@ -433,7 +433,6 @@ proc ShowHelpDialog {} {
     destroy .add.frm_btn.btn_ok
     return $frm    
 }
-
 namespace eval Run {} {}
 # Получение данных по кластерам
 
diff --git a/rac_gui.tcl b/rac_gui.tcl
index ff24a31..0bc5afb 100755
--- a/rac_gui.tcl
+++ b/rac_gui.tcl
@@ -124,3 +124,7 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] {
 } else {
     set servers_list ""
 }
+<<<<<<< HEAD
+=======
+
+>>>>>>> unstable