From 6843c98103073e2aee4b673a1bea896ef7ea21a1 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 19 Aug 2006 15:37:54 +0000
Subject: [PATCH] Resolve conflicts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4386 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 tools/build/makeshorewall | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/build/makeshorewall b/tools/build/makeshorewall
index 45bd66256..c5baacda5 100755
--- a/tools/build/makeshorewall
+++ b/tools/build/makeshorewall
@@ -339,7 +339,9 @@ if [ -n "${BUILDTARBALL}${BUILDRPM}" ]; then
     do_or_die "rm -rf $SHOREWALLDIR/debian"
 
     if [ -n "$BUILDTARBALL" ]; then
+	
 	progress_message "Creating $DIR/$TARBALL..."
+	
 	for lib in $XLIBS; do
 	    rm -f $SHOREWALLDIR/lib.${lib}
 	done