[tmux/f13/master] fix my error

[Filipe Rosset]

commit 1f8185cfa17d13e1a0ea08395c176ebee593bef6
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Fri Aug 6 01:21:15 2010 -0300

    fix my error

 tmux.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/tmux.spec b/tmux.spec
index cfc3585..248fcb6 100644
--- a/tmux.spec
+++ b/tmux.spec
@@ -1,9 +1,5 @@
 Name:           tmux
-<<<<<<< HEAD
-Version:        1.2
-=======
 Version:        1.3
->>>>>>> master
 Release:        1%{?dist}
 Summary:        A terminal multiplexer
 
@@ -67,12 +63,9 @@ getent group tmux >/dev/null || groupadd -r tmux
 %attr(775,root,tmux) %{_localstatedir}/run/tmux
 
 %changelog
-<<<<<<< HEAD
-=======
 * Mon Jul 19 2010 Sven Lankes <sven at lank.es> 1.3-1
 - New upstream release
 
->>>>>>> master
 * Sun Mar 28 2010 Sven Lankes <sven at lank.es> 1.2-1
 - New upstream release
 - rediff writehard patch