sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oop missed a merge conflict

Browse Source
This commit is contained in:
John Cupitt 2017-01-04 10:18:54 +00:00
parent 262d5a10f7
commit 0c4a40e82f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvips/include/vips/util.h
View File

@ -135,7 +135,6 @@ G_STMT_START { \
} \ } \
} G_STMT_END } G_STMT_END
<<<<<<< HEAD
/* The g_info() macro was added in 2.40. /* The g_info() macro was added in 2.40.
*/ */
#ifndef g_info #ifndef g_info
@ -145,8 +144,6 @@ G_STMT_START { \
g_log( G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__ ) g_log( G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__ )
#endif #endif
=======
>>>>>>> master
/* Various integer range clips. Record over/under flows. /* Various integer range clips. Record over/under flows.
*/ */
#define VIPS_CLIP_UCHAR( V, SEQ ) \ #define VIPS_CLIP_UCHAR( V, SEQ ) \