missed some conflict markup

2012-10-09 07:59:44 -04:00 · 2012-10-09 07:59:44 -04:00 · 92849c5cc3
parent 252af020b0
commit 92849c5cc3
1 changed files with 0 additions and 1 deletions
--- 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)