Resolve Conflicts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3063 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2005-11-25 16:31:52 +00:00
parent b6a8bf94c4
commit 9dcd435b50

View File

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