ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 03:15:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

missed some conflict markup

Browse Source
This commit is contained in:
BlueWall
2012-10-09 07:59:44 -04:00
parent 252af020b0
commit 92849c5cc3
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Server/ServerMain.cs
View File

@@ -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)