mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-19 02:32:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

conflict

Browse Source
This commit is contained in:
Chris Young 2016-01-25 18:26:22 +00:00
parent 09ac17955b
commit beb6cebf1e
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amiga/bitmap.c
View File

@ -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,