diff options
| author | Melanie Thielker | 2010-08-09 02:46:09 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-09 02:46:09 +0200 |
| commit | f20dc512e87983b9ba6b86f806489380d3cfef5a (patch) | |
| tree | 4bdac7d50e46648a76e9e58785c19178826166db /OpenSim/Services | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.zip opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.gz opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.bz2 opensim-SC_OLD-f20dc512e87983b9ba6b86f806489380d3cfef5a.tar.xz | |
Whitespace conflict
Diffstat (limited to 'OpenSim/Services')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 602616f..0bf75b0 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -691,11 +691,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 691 | } | 691 | } |
| 692 | } | 692 | } |
| 693 | } | 693 | } |
| 694 | <<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs | ||
| 695 | } | ||
| 696 | ======= | ||
| 697 | } | 694 | } |
| 698 | >>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs | ||
| 699 | dest = destination; | 695 | dest = destination; |
| 700 | if (success) | 696 | if (success) |
| 701 | return aCircuit; | 697 | return aCircuit; |