[rear/el5/master] update for el6

[Gratien Dhaese]

commit 4e80c94fa3923cd98b33daee83f17a02e0896d74
Author: gdha <gratien.dhaese at gmailcom>
Date:   Tue Dec 14 08:54:25 2010 +0100

    update for el6

 .gitignore |    6 +-----
 rear.spec  |    1 -
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1d52e4..fb9aacb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-rear-1.7.25.tar.gz
-<<<<<<< HEAD
-=======
-/rear-1.7.26.tar.gz
->>>>>>> master
+rear-1.7.26.tar.gz
diff --git a/rear.spec b/rear.spec
index 8ca740e..921c213 100644
--- a/rear.spec
+++ b/rear.spec
@@ -92,7 +92,6 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Nov 25 2010 Gratien D'haese <gdha at sourceforge.net> - 1.7.26-1
 - fix bugzilla 657174 Rescue image freezes during the boot while executing init
 
->>>>>>> master
 * Fri Jun 04 2010 Gratien D'haese <gdha at sourceforge.net> - 1.7.25-1
 - added the %%ifarch part for syslinux to avoid warning on ppc/ppc64
 - fixed bugzilla 600217 (missing Fedora links)