seems to compile ( tests comented out)

1 files changed, 0 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
index 08dc3e3..e9cf4ad 100644
--- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
@@ -37,10 +37,6 @@ 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
     }
 }