bad merge?

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 99bc87d..445342d 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
@@ -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
     }
 }