bad merge?

1 files changed, 17 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index 6a7d4a1..eb79711 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -25,13 +25,29 @@
  * 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>
+        void UploadMapTile(IScene scene);
         void UploadMapTile(IScene scene, Bitmap mapTile);
     }
-}
\ No newline at end of file
+}
+>>>>>>> avn/ubitvar