From: Bdale Garbee <bdale@gag.com>
Date: Sun, 15 Feb 2009 17:21:10 +0000 (-0700)
Subject: missed a merge conflict
X-Git-Tag: debian/1.3.12-1~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=cdd3d7b10c6e50c809b55b3ea7ce11cb1822a17d;p=debian%2Fmtx

missed a merge conflict
---

diff --git a/mtx.spec.in b/mtx.spec.in
index a9f4a9d..f6fd5ed 100644
--- 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}