[weechat/el6] changelog entries fixed in spec file

[Russell William Golden]

commit a11b8432ae636be083b381f1799ddb8d3ce15f08
Author: Russell William Golden <niveusluna at niveusluna.org>
Date:   Sun Mar 18 10:37:26 2012 -0500

    changelog entries fixed in spec file

 weechat.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/weechat.spec b/weechat.spec
index 2f90508..ca3d3e1 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -67,7 +67,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-<<<<<<< HEAD
 * Sun Mar 18 2012 Russell Golden <niveusluna at niveusluna.org> - 0.3.7-1
 - new upstream version