From 155ad2c6d2b772528fc28c7f524147c3d2ed6a4a Mon Sep 17 00:00:00 2001
From: grafixeyehero <grafixeyehero>
Date: Fri, 11 Oct 2019 20:35:12 +0300
Subject: [PATCH] commit out mergeserver

---
 src/bower_components/apiclient/connectionmanager.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bower_components/apiclient/connectionmanager.js b/src/bower_components/apiclient/connectionmanager.js
index b3ff1fc9e3..80247f8cb1 100644
--- a/src/bower_components/apiclient/connectionmanager.js
+++ b/src/bower_components/apiclient/connectionmanager.js
@@ -838,8 +838,8 @@ define(["events", "apiclient", "appStorage"], function (events, apiClientFactory
                 var connectServers = responses[0];
                 var foundServers = responses[1];
                 var servers = credentials.Servers.slice(0);
-                mergeServers(credentialProvider, servers, foundServers);
-                mergeServers(credentialProvider, servers, connectServers);
+                //mergeServers(credentialProvider, servers, foundServers);
+                //mergeServers(credentialProvider, servers, connectServers);
                 servers = filterServers(servers, connectServers);
                 servers.sort(function (a, b) {
                     return (b.DateLastAccessed || 0) - (a.DateLastAccessed || 0);