[shorewall] Remove residual merge tag from spec file

[Jonathan G. Underwood]

commit af60e8baba60d46eddf883cf5361e2582cbb0e1a
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Thu Jul 21 01:29:57 2011 +0100

    Remove residual merge tag from spec file

 shorewall.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/shorewall.spec b/shorewall.spec
index 928aa05..e699515 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -219,7 +219,6 @@ fi
 %config(noreplace) %{_sysconfdir}/shorewall/*
 %config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
 
-<<<<<<< HEAD
 %{_libexecdir}/shorewall
 %{_datadir}/shorewall