[Opensim-users] Conflicts with Inventory Archive Solved?

[Justin Clark-Casey]

On 06/08/10 05:39, DutchGlory wrote:
>
> I have a question about Inventory archive, are all conflicts solved?  (within
> source code)  i use Inventory archive weekly,
> so i want to be sure its works. I don't want to lose stuff

Don't worry, there are no conflicts left in the code - this is just the default git message for a merge in which some 
adjustments had to be made.

>
> commit a133acbd5fc1a402796dfeb014ade20db77d4824
> Merge: a1d7911 5925aac
> Author: Justin Clark-Casey (justincc)
> Date:   Wed Aug 4 20:56:52 2010 +0100
>
>      Merge branch 'iar-merge'
>
>      Conflicts:
>
> OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
>
> OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
>
>
>
>
>
>


-- 
Justin Clark-Casey (justincc)
http://justincc.org
http://twitter.com/justincc