X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.tetrasec.net (mx1.tetrasec.net [74.117.190.25]) by lists.alpinelinux.org (Postfix) with ESMTP id E29945C4B3D for ; Mon, 24 Jul 2017 10:42:40 +0000 (GMT) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id B8BAC9E24DE; Mon, 24 Jul 2017 10:42:40 +0000 (GMT) Received: from ncopa-desktop.copa.dup.pw (15.63.200.37.customer.cdi.no [37.200.63.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mx1.tetrasec.net (Postfix) with ESMTPSA id AF0D29E0120; Mon, 24 Jul 2017 10:42:39 +0000 (GMT) Date: Mon, 24 Jul 2017 12:42:35 +0200 From: Natanael Copa To: Ivan Tham Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] testing/you-get: upgrade to 0.4.775 Message-ID: <20170724124235.62191b10@ncopa-desktop.copa.dup.pw> In-Reply-To: <20170723230443.12363-1-pickfire@riseup.net> References: <20170723230443.12363-1-pickfire@riseup.net> X-Mailer: Claws Mail 3.15.0-dirty (GTK+ 2.24.31; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 24 Jul 2017 07:04:43 +0800 Ivan Tham wrote: > --- > community/you-get/APKBUILD | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/community/you-get/APKBUILD b/community/you-get/APKBUILD > index b58d34a58f..39847d5e83 100644 > --- a/community/you-get/APKBUILD > +++ b/community/you-get/APKBUILD > @@ -1,7 +1,11 @@ > # Contributor: Ivan Tham > # Maintainer: Ivan Tham > pkgname=you-get > +<<<<<<< HEAD:community/you-get/APKBUILD > pkgver=0.4.750 > +======= > +pkgver=0.4.775 > +>>>>>>> testing/you-get: upgrade to 0.4.775:testing/you-get/APKBUILD It looks like you had a merge conflict that was not properly solved. -nc > pkgrel=0 > pkgdesc="Tiny command line utility to download media contents" > url="https://you-get.org/" > @@ -28,4 +32,8 @@ package() { > python3 setup.py install --prefix=/usr --root="$pkgdir" > } > > +<<<<<<< HEAD:community/you-get/APKBUILD > sha512sums="3d328ecca33d2c2a376056aec22af742922fdfa57eee5a504e8741ba54e3ff8cb3499c2bc6c7689c11a5b2aa4bcbb37d8dc434a116875ff041adaf831e146419 you-get-0.4.750.tar.gz" > +======= > +sha512sums="adee5d801bb78118e9aac4a90c60e1e93a1354c80b9a782dfb66fd4edf3c73ced95de64199e3434e70ab802128ebb53f5eef350bf0d4625de3659644ce953771 you-get-0.4.775.tar.gz" > +>>>>>>> testing/you-get: upgrade to 0.4.775:testing/you-get/APKBUILD --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---