[nsd/el6] updated

[Paul Wouters]

commit 64ab69afc02ff7d4c51e3f77c0381f11559b7f9a
Author: Paul Wouters <paul at xelerance.com>
Date:   Tue Jun 7 18:03:31 2011 -0400

    updated

 .gitignore |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c12867e..4a97d66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 nsd-2.3.5.tar.gz
 nsd-2.3.6.tar.gz
 nsd.init
@@ -15,8 +14,5 @@ nsd-3.2.1.tar.gz
 nsd-3.2.2.tar.gz
 nsd-3.2.3.tar.gz
 nsd-3.2.4.tar.gz
-/nsd-3.2.7.tar.gz
-=======
 nsd-3.2.7.tar.gz
-/nsd-3.2.8.tar.gz
->>>>>>> ef18144... * Tue Jun  7 2011 Paul Wouters <paul at xelerance.com> - 3.2.8-1
+nsd-3.2.8.tar.gz