diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index be12f8af1d..8be69a93a4 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -86,7 +86,6 @@ namespace OpenSim.Server
             }
 
             string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'});
->>>>>>> master
 
 //            int i = 0;
             foreach (string c in conns)