[mussh/el5] Fix spec for merge

[Kevin Fenzi]

commit dadc6680a12c609b994d5ecbe2ebee71039f909f
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Nov 16 22:16:07 2011 -0700

    Fix spec for merge

 mussh.spec |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/mussh.spec b/mussh.spec
index c99c74f..dc0df9f 100644
--- a/mussh.spec
+++ b/mussh.spec
@@ -1,11 +1,6 @@
 Name:           mussh
-<<<<<<< HEAD
-Version:        0.7
-Release:        2%{?dist}
-=======
 Version:        1.0
 Release:        0%{?dist}
->>>>>>> origin/master
 Summary:        Multihost SSH wrapper
 
 Group:          Applications/System
@@ -45,8 +40,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Nov 16 2011 Kevin Fenzi <kevin at scrye.com> - 1.0-0
 - Update to new 1.0 upstream release. 
 
@@ -59,7 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
->>>>>>> origin/master
 * Mon Aug 27 2007 Kevin Fenzi <kevin at tummy.com> 0.7-2
 - Update License tag