revert to upstream

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

diff --git a/gnulib/regenerate/no-error.patch.BACKUP.7723.patch b/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
index 6dcbd6754e962930c23fe21fb52075d50212a2aa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
+++ b/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
@@ -1,18 +0,0 @@
-Index: gnulib/Makefile.am
-===================================================================
---- gnulib/Makefile.am (revision 5691)
-+++ gnulib/Makefile.am (working copy)
-@@ -26,6 +26,9 @@
- MAINTAINERCLEANFILES =
- 
- AM_CPPFLAGS =
-+if GCC_COMPILER
-<<<<<<< HEAD:gnulib/regenerate/no-error.patch
-+  AM_CFLAGS += -Wno-error
-=======
-+  AM_CFLAGS = -Wno-error -Wno-sign-compare
->>>>>>> upstream:gnulib/regenerate/no-error.patch
-+endif
- 
- noinst_LTLIBRARIES += libgnu.la
-