seems to compile ( tests comented out)

1 files changed, 0 insertions, 6 deletions

diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index 0d1458e..b8d45dd 100644
--- a/OpenSim/Services/Interfaces/IMapImageService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -34,14 +34,8 @@ namespace OpenSim.Services.Interfaces
     public interface IMapImageService
     {
         //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
-<<<<<<< HEAD
-        bool AddMapTile(int x, int y, byte[] imageData, out string reason);
-        bool RemoveMapTile(int x, int y, out string reason);
-        byte[] GetMapTile(string fileName, out string format);
-=======
         bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
         bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
         byte[] GetMapTile(string fileName, UUID scopeID, out string format);
->>>>>>> avn/ubitvar
     }
 }