Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] testing/you-get: upgrade to 0.4.775

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Mon, 24 Jul 2017 12:42:35 +0200

On Mon, 24 Jul 2017 07:04:43 +0800
Ivan Tham <pickfire_at_riseup.net> 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
> _at_@ -1,7 +1,11 @@
> # Contributor: Ivan Tham <pickfire_at_riseup.net>
> # Maintainer: Ivan Tham <pickfire_at_riseup.net>
> 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/"
> _at_@ -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_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Mon Jul 24 2017 - 12:42:35 UTC