ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
View File

@@ -127,7 +127,12 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
/// <param name="options">
/// Dictionary of options.
<<<<<<< HEAD
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string,object> options);
=======
/// </param>
void DearchiveRegion(Stream loadStream, Guid requestId, Dictionary<string, object> options);
>>>>>>> avn/ubitvar
}
}