Merge

2019-09-30 13:19:48 +03:00 · 2019-09-30 13:19:48 +03:00 · 21b0eba188
commit 21b0eba188
parent 2030adf392
1 changed files with 0 additions and 4 deletions
--- a/rac_gui.tcl
+++ b/rac_gui.tcl
@ -124,7 +124,3 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] {
 } else {
    set servers_list ""
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> unstable