summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 0 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 966fe7ba83d6..83ed5ccc9088 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,6 @@ pkgbase = accel-ppp-vlanmon-dkms-git
license = GPL
depends = dkms
depends = lua51
- conflicts = accel-ppp-ipoe-dkms
source = accel-ppp::git+git://git.code.sf.net/p/accel-ppp/code
source = dkms.conf
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 36c9f1f018a5..c28c40477575 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64')
url='http://sourceforge.net/apps/trac/accel-ppp/'
license=('GPL')
depends=('dkms' 'lua51')
-conflicts=('accel-ppp-ipoe-dkms')
source=('accel-ppp::git+git://git.code.sf.net/p/accel-ppp/code'
'dkms.conf')