[gofer/el6] Fix merge conflicts.

[Jeff Ortel]

commit eabb18386544bbd6846d5d741253dbc2a318a572
Author: Jeff Ortel <jortel at redhat.com>
Date:   Fri Oct 5 15:56:40 2012 -0500

    Fix merge conflicts.

 gofer.spec |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/gofer.spec b/gofer.spec
index 551acdb..8f4d431 100644
--- a/gofer.spec
+++ b/gofer.spec
@@ -248,8 +248,6 @@ This plug-in provides RMI access to package (RPM) management.
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Oct 03 2012 Jeff Ortel <jortel at redhat.com> 0.74-1
 - Make watchdog journal object configurable; watchdog singleton by URL only.
   (jortel at redhat.com)
@@ -305,7 +303,6 @@ This plug-in provides RMI access to package (RPM) management.
 - support setting producer uuid; HMAC enhancements. (jortel at redhat.com)
 - rel-eng: rename redhat releaser. (jortel at redhat.com)
 
->>>>>>> master
 * Tue Feb 21 2012 Jeff Ortel <jortel at redhat.com> 0.66-1
 - Add DistGit releaser. (jortel at redhat.com)
 - Add deps: python-iniparse; python-hashlib (rhel5). (jortel at redhat.com)