From bab4f9df3376a996162a5ddd0cdb320aabe42251 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 6 Jul 2009 18:08:17 -0700 Subject: [PATCH] Resolve revert conflicts --- Shorewall/releasenotes.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d80d5bb9d..c7a39db89 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -130,10 +130,7 @@ None. N E W F E A T U R E S I N 4 . 4 . 0 Beta 4 ---------------------------------------------------------------------------- -1) The DISABLE_IPV6 option has been removed. If DISABLE_IPV6=Yes is - given in shorewall.conf, a warning will be issued. - -2) Paul Gear has contributed the following macros: +1) Paul Gear has contributed the following macros: macro.Webcache (originally named macro.DG) macro.IPPbrd