From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')

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