Commit 9b2c2bed authored by Leonardo Arena's avatar Leonardo Arena

main/ulogd: fix git merge

parent 1960a2d0
# Maintainer: Leonardo Arena <rnalrd@gmail.com> # Maintainer: Leonardo Arena <rnalrd@gmail.com>
pkgname=ulogd pkgname=ulogd
<<<<<<< HEAD
pkgver=2.0.0_beta3
_pkgver=2.0.0beta3
pkgrel=1 pkgrel=1
=======
pkgver=1.24 pkgver=1.24
<<<<<<< HEAD
pkgrel=0
>>>>>>> 52acbbb... testing/ulogd: downgraded to stable v1.24
=======
pkgrel=1
>>>>>>> 629d95e... testing/ulogd: logrotate support added
pkgdesc="A userspace logging daemon for netfilter/iptables related logging" pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
url="http://netfilter.org/projects/ulogd/index.html" url="http://netfilter.org/projects/ulogd/index.html"
license="GPL" license="GPL"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment