From 21b0eba1889f33a9f8d320e2a27d5135d2c1bb4d Mon Sep 17 00:00:00 2001
From: Sergey Kalinin <banzaj28@yandex.ru>
Date: Mon, 30 Sep 2019 13:19:48 +0300
Subject: [PATCH] Merge

---
 rac_gui.tcl | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rac_gui.tcl b/rac_gui.tcl
index 0bc5afb..ff24a31 100755
--- 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