diff options
| author | BlueWall | 2012-10-09 07:59:44 -0400 |
|---|---|---|
| committer | BlueWall | 2012-10-09 07:59:44 -0400 |
| commit | 92849c5cc39bb6d83c478c300ba10fab9d7f8bfc (patch) | |
| tree | cae6c3bfa72ae356e726850039ac7559af94a8db /OpenSim/Server | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| download | opensim-SC-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.zip opensim-SC-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.gz opensim-SC-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.bz2 opensim-SC-92849c5cc39bb6d83c478c300ba10fab9d7f8bfc.tar.xz | |
missed some conflict markup
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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 | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'}); | 88 | string[] conns = connList.Split(new char[] {',', ' ', '\n', '\r', '\t'}); |
| 89 | >>>>>>> master | ||
| 90 | 89 | ||
| 91 | // int i = 0; | 90 | // int i = 0; |
| 92 | foreach (string c in conns) | 91 | foreach (string c in conns) |