Merge

2019-09-30 13:16:13 +03:00 · 2019-09-30 13:16:13 +03:00 · 2030adf392
parent 8ca49643b0 913a734817
commit 2030adf392
2 changed files with 4 additions and 1 deletions
--- 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 {} {}
 # Получение данных по кластерам

--- 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