From 5f15439ca7eacc49da1aee5619fdb2a0b152ee1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?=
 <coadde@lavabit.com>
Date: Tue, 12 Mar 2013 01:55:34 -0300
Subject: {iceweasel,icecat}-{adblock-plus,noscript}: drop conflicts

---
 libre/icecat-noscript/PKGBUILD | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libre/icecat-noscript/PKGBUILD')

diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 2f78dd128..31a2a765d 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -11,7 +11,6 @@ arch=('any')
 url="http://noscript.net/"
 license=('GPL2')
 depends=()
-conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-- 
cgit v1.2.3-2-g168b