From 43bbdc520dd054acdf46088fbbee5d4a3b638d24 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 22 May 2016 15:10:51 +0100
Subject: Fix merge error

---
 frontends/amiga/bitmap.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 06d1f1f90..8c0f0b336 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -129,7 +129,7 @@ void *amiga_bitmap_create(int width, int height, unsigned int state)
 
 		bitmap->pixdata = NULL;
 		UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap);
-		memset(bitmap->pixdata, 0xff, bitmap->size);
+		memset(pixdata, 0xff, bitmap->size);
 	} else
 #endif
 	{
@@ -230,6 +230,11 @@ void amiga_bitmap_destroy(void *bitmap)
 			ami_memory_clear_free(bm->pixdata);
 		}
 
+<<<<<<< HEAD
+=======
+		if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle);
+
+>>>>>>> Fix merge error
 		if(bm->url) nsurl_unref(bm->url);
 		if(bm->title) free(bm->title);
 
-- 
cgit v1.2.3