Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] main/mini_httpd: Added description to init.d script

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Fri, 20 Nov 2015 11:22:01 +0100

On Thu, 19 Nov 2015 19:09:09 +0100
Daniele Coli <danielsan.dani_at_gmail.com> wrote:

> Added description to init.d script in order to make it compliant
> with rc-system and avoid annoying warning messages on syslog.
> ---
> main/ipset/APKBUILD | 5 +++++
> main/mini_httpd/APKBUILD | 8 ++++----
> main/mini_httpd/mini_httpd.initd | 2 ++
> 3 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/main/ipset/APKBUILD b/main/ipset/APKBUILD
> index 0706a0d..d088c08 100644
> --- a/main/ipset/APKBUILD
> +++ b/main/ipset/APKBUILD
> _at_@ -1,8 +1,13 @@
> # Contributor: Kaarle Ritvanen <kaarle.ritvanen_at_datakunkku.fi>
> # Maintainer: Kaarle Ritvanen <kaarle.ritvanen_at_datakunkku.fi>
> pkgname=ipset
> +<<<<<<< 3d3cd382227f735072e0721ce23155af42297b69
> pkgver=6.27
> pkgrel=0
> +=======
> +pkgver=6.25.1
> +pkgrel=1
> +>>>>>>> main/ipset: Increased pkgrel


This looks like an unresolved conflict that got into the commit

I'll clean that up.

thanks!

-nc


---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Fri Nov 20 2015 - 11:22:01 GMT