[httpd/f15] - fix merge

[jorton]

commit 9959a86bf3d852ddf2acdbd198a05238ce0d70d2
Author: Joe Orton <jorton at redhat.com>
Date:   Tue Sep 13 13:49:31 2011 +0100

    - fix merge

 .gitignore |    3 ---
 sources    |    4 ----
 2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff441c4..9e9a9ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,7 @@ x86_64
 /*.rpm
 /.build*.log
 /noarch
-<<<<<<< HEAD
-=======
 /httpd-2.2.19.tar.gz
 /httpd-2.2.20.tar.gz
 /httpd-2.2.21.tar.bz2
 /clog
->>>>>>> f93baaa... update to 2.2.21
diff --git a/sources b/sources
index 9787c07..e31a82e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-e9f5453e1e4d7aeb0e7ec7184c6784b5  httpd-2.2.19.tar.gz
-=======
 1696ae62cd879ab1d4dd9ff021a470f2  httpd-2.2.21.tar.bz2
->>>>>>> f93baaa... update to 2.2.21