[rear/el5/master] missed a merge item

[Gratien Dhaese]

commit 3286862a23c0a7bf3a1fa47ae7c5d3d59688f156
Author: gdha <gratien.dhaese at gmailcom>
Date:   Tue Dec 14 08:33:34 2010 +0100

    missed a merge item

 rear.spec |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/rear.spec b/rear.spec
index 0933447..8ca740e 100644
--- a/rear.spec
+++ b/rear.spec
@@ -89,8 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * 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