1 files changed, 0 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index eb79711..5151567 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -25,24 +25,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-<<<<<<< HEAD
-using System.Drawing;
-using OpenSim.Framework;
-=======
 using OpenMetaverse;
 using OpenSim.Framework;
 using System.Drawing;
->>>>>>> avn/ubitvar
 
 namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IMapImageUploadModule
     {
-<<<<<<< HEAD
-        void UploadMapTile(IScene scene, Bitmap mapTile);
-    }
-}
-=======
         /// <summary>
         /// Upload a new maptile
         /// </summary>
@@ -50,4 +40,3 @@ namespace OpenSim.Region.Framework.Interfaces
         void UploadMapTile(IScene scene, Bitmap mapTile);
     }
 }
->>>>>>> avn/ubitvar