1 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index 9c781e1..08dc3e3 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -37,6 +37,10 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void GenerateMaptile();
         List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag);
+<<<<<<< HEAD
         MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag);
+=======
+        void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag);
+>>>>>>> avn/ubitvar
     }
 }