diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2010-09-22 14:19:30 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@gmail.com> | 2010-09-22 14:20:19 +0000 |
| commit | 9b2c2bedb7e85d01b7761933267b046810b74dad (patch) | |
| tree | a205a3e245da7949d4eb08c23d438cf3deb0fa70 | |
| parent | 1960a2d07dbf3a3e1ddc7fb7c8763889a049d33a (diff) | |
| download | aports-9b2c2bedb7e85d01b7761933267b046810b74dad.tar.bz2 aports-9b2c2bedb7e85d01b7761933267b046810b74dad.tar.xz | |
main/ulogd: fix git merge
| -rw-r--r-- | main/ulogd/APKBUILD | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/main/ulogd/APKBUILD b/main/ulogd/APKBUILD index 5873684993..a57cac5e47 100644 --- a/main/ulogd/APKBUILD +++ b/main/ulogd/APKBUILD @@ -1,17 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=ulogd -<<<<<<< HEAD -pkgver=2.0.0_beta3 -_pkgver=2.0.0beta3 pkgrel=1 -======= 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" url="http://netfilter.org/projects/ulogd/index.html" license="GPL" |