[Opensim-users] Conflicts with Inventory Archive Solved?

[DutchGlory]

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 
 
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

 




-- 
View this message in context: http://opensim-users.2152040.n2.nabble.com/Conflicts-with-Inventory-Archive-Solved-tp5379329p5379329.html
Sent from the opensim-users mailing list archive at Nabble.com.