From e83ecc28f99d2e4420e1c13f6ceeeec158d25bbc Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Mon, 20 Jul 2020 06:32:40 +1000
Subject: [PATCH] chore(windows): remove merge issue

---
 windows/src/global/delphi/general/Upload_Settings.pas | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/windows/src/global/delphi/general/Upload_Settings.pas b/windows/src/global/delphi/general/Upload_Settings.pas
index 8c7ae3ccb1..5ba1893bee 100644
--- a/windows/src/global/delphi/general/Upload_Settings.pas
+++ b/windows/src/global/delphi/general/Upload_Settings.pas
@@ -147,14 +147,6 @@ begin
   Result := API_Protocol + '://' + API_Server + path;
 end;
 
-function DefaultServersXMLTags: string;
-begin
-  Result := Format('<keyman-com>%s</keyman-com><api-keyman-com>%s</api-keyman-com>', [
-    XMLEncode(KeymanCom_Protocol_Server),
-    XMLEncode(MakeAPIURL(''))
-  ]);
-end;
-
 function URLPath_PackageDownload(const PackageID, BCP47: string; IsUpdate: Boolean): string;
 var
   IsUpdateInt: Integer;