diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-25 18:26:22 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-25 18:26:22 +0000 |
| commit | beb6cebf1e25cd95f7b2e5acbcb35defcf1496b5 (patch) | |
| tree | a795154c8a9fb6a66b974623e9affb92ff5aa201 /amiga/bitmap.c | |
| parent | 09ac17955ba4e96cef087619eb6b9c61429ea28e (diff) | |
| download | netsurf-beb6cebf1e25cd95f7b2e5acbcb35defcf1496b5.tar.gz netsurf-beb6cebf1e25cd95f7b2e5acbcb35defcf1496b5.tar.bz2 | |
conflict
Diffstat (limited to 'amiga/bitmap.c')
| -rw-r--r-- | amiga/bitmap.c | 4 |
1 files changed, 0 insertions, 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, |