From 92849c5cc39bb6d83c478c300ba10fab9d7f8bfc Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Tue, 9 Oct 2012 07:59:44 -0400
Subject: missed some conflict markup

---
 OpenSim/Server/ServerMain.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index be12f8a..8be69a9 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)
-- 
cgit v1.1