holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Whoops! Conflict text was still present.

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3682 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
paulgear 2006-03-17 02:18:31 +00:00
parent f1c458fa18
commit 4b2f84eb7b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Samples/README.txt
View File

@ -1,6 +1,5 @@
For instructions on using these sample configurations, please see
<<<<<<< .mine
http://www.shorewall.net/shorewall_quickstart_guide.htm
Shorewall Samples
@ -25,10 +24,6 @@ http://www.shorewall.net/shorewall_quickstart_guide.htm
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
http://www.gnu.org/licenses/lgpl.html
=======
http://www.shorewall.net/shorewall_quickstart_guide.htm
Sample files are licensed under the LGPL, please see the LICENSE file or http://www.gnu.org/licenses/lgpl.html for more details.
Sample files are licensed under the LGPL, please see the LICENSE file for more details.
>>>>>>> .r3680