svk
/
rac-gui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge

master
Sergey Kalinin 2019-09-30 13:16:13 +03:00
parent 8ca49643b0 913a734817
commit 2030adf392
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/function.tcl
View File

@ -433,7 +433,6 @@ proc ShowHelpDialog {} {
destroy .add.frm_btn.btn_ok destroy .add.frm_btn.btn_ok
return $frm return $frm
} }
namespace eval Run {} {} namespace eval Run {} {}
# Получение данных по кластерам # Получение данных по кластерам

4
rac_gui.tcl
View File

@ -124,3 +124,7 @@ if [file exists [file join $dir(work) 1c_srv_new.cfg]] {
} else { } else {
set servers_list "" set servers_list ""
} }
<<<<<<< HEAD
=======
>>>>>>> unstable