From 9dcd435b506e8b74edfc51ad9e7226c3a7966836 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 25 Nov 2005 16:31:52 +0000
Subject: [PATCH] Resolve Conflicts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3063 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-docs2/Install.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Shorewall-docs2/Install.xml b/Shorewall-docs2/Install.xml
index e6b07f665..592a7c0eb 100644
--- a/Shorewall-docs2/Install.xml
+++ b/Shorewall-docs2/Install.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <article id="Install">
+
   <!--$Id$-->
 
   <articleinfo>
@@ -15,7 +16,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>2005-11-22</pubdate>
+    <pubdate>2005-11-23</pubdate>
 
     <copyright>
       <year>2001-</year>