Merge
This commit is contained in:
parent
2030adf392
commit
21b0eba188
|
@ -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
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user