From ec062736ffd0df0417a6e8dc16ee6fbb7eda0091 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 15 Jul 2020 05:32:32 +1000
Subject: [PATCH] fix: cleanup broken merge

---
 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 a674968e5e..ef7f156cb2 100644
--- a/windows/src/global/delphi/general/Upload_Settings.pas
+++ b/windows/src/global/delphi/general/Upload_Settings.pas
@@ -146,14 +146,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;