missed a merge conflict

diff --git a/mtx.spec.in b/mtx.spec.in
index a9f4a9d7045d0e0246066a7125da16e458031a56..f6fd5ed34a3f442eb6cf360c69f7b6c1d9584019 100644 (file)
--- a/mtx.spec.in
+++ b/mtx.spec.in
@@ -4,11 +4,7 @@ Release: 1%{?dist}
 Summary: SCSI media changer control program
 License: GPL
 Group: Utilities/System
-<<<<<<< HEAD:mtx.spec.in
-Source0: ftp://ftp.opensource-sw.net/pub/mtx/development/%{name}-%{version}.tar.gz
-=======
 Source0: ftp://ftp.opensource-sw.net/pub/mtx/stable/%{name}-%{version}.tar.gz
->>>>>>> upstream/1.3.12:mtx.spec.in
 Url: http://%{name}.sourceforge.net
 BuildRoot: /var/tmp/%{name}-%{version}