Whitespace conflict

2010-08-09 02:46:09 +02:00 · 2010-08-09 02:46:09 +02:00 · f20dc512e8
parent 1f052520ae
commit f20dc512e8
2 changed files with 1 additions and 5 deletions
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@ -691,11 +691,7 @@ namespace OpenSim.Services.LLLoginService
                        }
                    }
                }
-<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
            }
-=======
-            }
->>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
            dest = destination;
            if (success)
                return aCircuit;