[shorewall/f13/master] Fix merge conflicts in sources file

[Jonathan G. Underwood]

commit 20e2806e2db8392ac77d4b560660bffe836fc0f1
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date:   Sat Aug 7 21:22:22 2010 +0100

    Fix merge conflicts in sources file

 sources |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/sources b/sources
index 1768056..da637bf 100644
--- a/sources
+++ b/sources
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
-44703f454b5825247daf80514c821635  shorewall-4.4.10.tar.bz2
-17f010c3e620ac5298f0b357ed4f9339  shorewall6-4.4.10.tar.bz2
-debe02f63b6d9b27434eb11b765858fc  shorewall6-lite-4.4.10.tar.bz2
-212e87418a62cd025e421b69a28410ba  shorewall-init-4.4.10.tar.bz2
-70e80abffd9a017b294910eb5946e99b  shorewall-lite-4.4.10.tar.bz2
-=======
 518e42c844ddadc277c2559fe1d16d12  shorewall-4.4.11.1.tar.bz2
 0441b7cd27c22f268c0543e570a65c4a  shorewall6-4.4.11.1.tar.bz2
 2b1c7d8bcdf57c5c5a06498dcff6dbae  shorewall6-lite-4.4.11.1.tar.bz2
 2724db9240196ed1fd5728f3f028e70e  shorewall-init-4.4.11.1.tar.bz2
 efbd672fb61c9ebf66341b6505d399e8  shorewall-lite-4.4.11.1.tar.bz2
->>>>>>> master