From e634ff934dd1ab7b7d52617b77e940b83e26fddc Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Mon, 2 Feb 2015 12:41:03 +0100
Subject: [PATCH] batman-adv14: conflicts was already there, only add provides

---
 srcpkgs/batman-adv14/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template
index 2ca638ff06f..cbe8c7f5eeb 100644
--- a/srcpkgs/batman-adv14/template
+++ b/srcpkgs/batman-adv14/template
@@ -11,7 +11,6 @@ checksum=a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870
 conflicts="batman-adv>=0"
 wrksrc="batman-adv-$version"
 provides="batman-adv-$version_$revision"
-conflicts="batman-adv"
 
 triggers="dkms"
 dkms_modules="batman-adv14 ${version}"