From beb6cebf1e25cd95f7b2e5acbcb35defcf1496b5 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Mon, 25 Jan 2016 18:26:22 +0000
Subject: [PATCH] conflict

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

diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 73cb4e35f..c57fb8f20 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -558,11 +558,7 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap,
 
 static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content)
 {
-<<<<<<< HEAD
 //	if(ami_plot_screen_is_palettemapped() == true) return NSERROR_OK;
-=======
-	if(ami_plot_screen_is_palettemapped() == true) return NSERROR_OK;
->>>>>>> 6847fad65368bab3418eb716af4f9d485dfe30b1
 
 	struct redraw_context ctx = {
 		.interactive = false,