This commit is contained in:
Sergey Kalinin 2019-09-30 13:19:48 +03:00
parent 2030adf392
commit 21b0eba188

View File

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