OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace conflict

avinationmerge
Melanie Thielker 2010-08-09 02:46:09 +02:00
parent 1f052520ae
commit f20dc512e8
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -691,11 +691,7 @@ namespace OpenSim.Services.LLLoginService
} }
} }
} }
<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
} }
=======
}
>>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
dest = destination; dest = destination;
if (success) if (success)
return aCircuit; return aCircuit;