[qbittorrent/f17] fix bad merge

[leigh123linux]

commit ee2cce14930fe6f4c4dff1568385a529a5491de5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Jul 10 15:39:36 2013 +0100

    fix bad merge

 qbittorrent.spec |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/qbittorrent.spec b/qbittorrent.spec
index 22104f9..d06a631 100644
--- a/qbittorrent.spec
+++ b/qbittorrent.spec
@@ -139,7 +139,6 @@ fi
 * Wed Jan 23 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:3.0.8-2
 - Rebuild against new rb_libtorrent .so version
 
->>>>>>> master
 * Tue Jan 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:3.0.8-1
 - update to 3.0.8 release
 
@@ -159,13 +158,6 @@ fi
 * Thu Aug 09 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:3.0.0-1
 - update to 3.0.0 release
 
-<<<<<<< HEAD
-* Sun Jul 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:2.9.11-1
-- update to 2.9.11
-
-* Sun Jun 24 2012 leigh scott <leigh123linux at googlemail.com> - 1:2.9.10-1
-- update to 2.9.10
-=======
 * Thu Jul 26 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:3.0.0-0.10.rc5
 - Rebuild for boost-1.50.0
 
@@ -195,7 +187,6 @@ fi
 
 * Sun May 20 2012 leigh scott <leigh123linux at googlemail.com> - 1:3.0.0-0.1.beta2
 - update to 3.0.0beta2
->>>>>>> master
 
 * Mon May 07 2012 leigh scott <leigh123linux at googlemail.com> - 1:2.9.8-1
 - update to 2.9.8
@@ -203,12 +194,6 @@ fi
 * Mon Mar 19 2012 leigh scott <leigh123linux at googlemail.com> - 1:2.9.7-1
 - update to 2.9.7
 
-<<<<<<< HEAD
-* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.9.5-2
-- Rebuilt for c++ ABI breakage
-
-=======
->>>>>>> master
 * Sun Feb 19 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:2.9.5-1
 - update to 2.9.5