seems to compile ( tests comented out)

1 files changed, 0 insertions, 15 deletions

diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index a18cdc1..42a8c57 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -116,20 +116,6 @@ namespace OpenSim.Server.Base
             {
                 uint https_port = (uint)networkConfig.GetInt("https_port", 0);
 
-<<<<<<< HEAD
-                string cert_path = networkConfig.GetString("cert_path",String.Empty);
-                if (cert_path == String.Empty)
-                {
-                    System.Console.WriteLine("ERROR: Path to X509 certificate is missing, server can't start.");
-                    Environment.Exit(1);
-                }
-
-                string cert_pass = networkConfig.GetString("cert_pass",String.Empty);
-                if (cert_pass == String.Empty)
-                {
-                    System.Console.WriteLine("ERROR: Password for X509 certificate is missing, server can't start.");
-                    Environment.Exit(1);
-=======
                 m_log.WarnFormat("[SSL]: External flag is {0}", ssl_external);
                 if (!ssl_external)
                 {
@@ -152,7 +138,6 @@ namespace OpenSim.Server.Base
                 {
                     m_log.WarnFormat("[SSL]: SSL port is active but no SSL is used because external SSL was requested.");
                     MainServer.AddHttpServer(new BaseHttpServer(https_port));
->>>>>>> avn/ubitvar
                 }
             }
         }