[putty/el5/master] Tidy up spec file removing info from failed merge

[Mark Chappell]

commit 197ff8199565ef0986e10cb33d6c5aa31249cb19
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Fri Sep 10 16:12:51 2010 +0200

    Tidy up spec file removing info from failed merge

 putty.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/putty.spec b/putty.spec
index 78fa965..6f03238 100644
--- a/putty.spec
+++ b/putty.spec
@@ -24,11 +24,7 @@ Putty is a SSH, Telnet & Rlogin client - this time for Linux.
 
 %prep
 
-<<<<<<< HEAD
-%setup -q
-=======
 %setup -q -n %{name}-%{svndate}
->>>>>>> master
 %patch0 -p1
 
 %build
@@ -68,15 +64,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.20100910svn
 - Bump version in line with packaging specs
 
 * Fri Sep 10 2010 Mark Chappell <tremble at fedoraproject.org> - 0.60-6.8991svn
 - Update to latest GTK2 version from SVN (r8991)
 
->>>>>>> master
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.60-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild