merge error fix

emiMobileServer/Source/Common.Config.pas

@@ -14,6 +14,8 @@ type
     FWebAppFolder: string;
     FReportsFolder: string;
     FAuditEnabled: Boolean;
+    FMemoLogLevel: Integer;
+    FFileLogLevel: Integer;
     FRpId: string;
     FRpName: string;
     FTwilioAccountSid: string;
@@ -89,15 +91,6 @@ begin
   end;
 
   Logger.Log(1, '-- Config file found.');
-    Logger.Log(1, '');
-    Logger.Log(1, '--- Server Config Values ---');
-    Logger.Log(1, '-- url: ' + serverConfig.url + IfThen(serverConfig.url = defaultServerUrl, ' [default]', ' [from config]'));
-    Logger.Log(1, '-- adminPassword: ' + serverConfig.adminPassword + IfThen(serverConfig.adminPassword = 'whatisthisusedfor', ' [default]', ' [from config]'));
-    Logger.Log(1, '-- jwtTokenSecret: ' + serverConfig.jwtTokenSecret + IfThen(serverConfig.jwtTokenSecret = 'super_secret0123super_secret4567', ' [default]', ' [from config]'));
-    Logger.Log(1, '-- webAppFolder: ' + serverConfig.webAppFolder + IfThen(serverConfig.webAppFolder = 'static', ' [default]', ' [from config]'));
-    Logger.Log(1, '-- auditEnabled: ' + BoolToStr(serverConfig.auditEnabled, True));
-  end
-  else
   jsonObj := TJSONObject.ParseJSONValue(TFile.ReadAllText(configFile)) as TJSONObject;
 
   if not Assigned(jsonObj) then