From 36b26b861f375de5b2be3ff9de37288049f05a26 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 31 Dec 2016 14:17:22 +0000
Subject: Update to test ExtMem on OS4.1FEU1 Mostly works, but falls over when
 there are lots of tiny GIF anims on screen

---
 frontends/amiga/bitmap.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'frontends/amiga/bitmap.c')

diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c
index 8c0f0b336..fe84a94b7 100644
--- a/frontends/amiga/bitmap.c
+++ b/frontends/amiga/bitmap.c
@@ -230,11 +230,6 @@ 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