use of ../amanda looks out of date

[debian/amanda] / gnulib / regenerate / no-error.patch

diff --git a/gnulib/regenerate/no-error.patch b/gnulib/regenerate/no-error.patch
index ebe43e478eee349fedac3d780f583ef9d95d8503..f62dd5702e24fb0bb1949d821b4acbeb24890159 100644 (file)
--- a/gnulib/regenerate/no-error.patch
+++ b/gnulib/regenerate/no-error.patch
@@ -2,17 +2,14 @@ Index: gnulib/Makefile.am
 ===================================================================
 --- gnulib/Makefile.am (revision 5691)
 +++ gnulib/Makefile.am (working copy)
-@@ -26,6 +26,9 @@
+@@ -27,6 +27,9 @@
  MAINTAINERCLEANFILES =
  
  AM_CPPFLAGS =
 +if GCC_COMPILER
-<<<<<<< HEAD:gnulib/regenerate/no-error.patch
-+  AM_CFLAGS += -Wno-error
-=======
 +  AM_CFLAGS = -Wno-error -Wno-sign-compare
->>>>>>> fb2bd066c2f8b34addafe48d62550e3033a59431:gnulib/regenerate/no-error.patch
 +endif
+ AM_CFLAGS =
  
  noinst_LTLIBRARIES += libgnu.la