1 Index: gnulib/Makefile.am
2 ===================================================================
3 --- gnulib/Makefile.am (revision 5691)
4 +++ gnulib/Makefile.am (working copy)
10 <<<<<<< HEAD:gnulib/regenerate/no-error.patch
11 + AM_CFLAGS += -Wno-error
13 + AM_CFLAGS = -Wno-error -Wno-sign-compare
14 >>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/no-error.patch
17 noinst_LTLIBRARIES += libgnu.la