From 2fff297942fd9108971f7f3e25be1eee69ecbcd6 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 23 Aug 2018 15:22:53 -0400
Subject: libre/iceweasel: Drop conflicts=(firefox)

Let your-freedom do that.
---
 libre/iceweasel/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'libre')

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index f4535b593..d669208ff 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -26,7 +26,6 @@
 #  - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick
 #  - added replaces, conflicts: firefox
 
-_pkgname=firefox
 pkgname=iceweasel
 epoch=1
 pkgver=61.0.2
@@ -49,8 +48,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'pulseaudio: Audio support'
             'speech-dispatcher: Text-to-Speech')
 options=(!emptydirs !makeflags !strip)
-replaces=("$_pkgname")
-conflicts=("$_pkgname")
+replaces=('firefox')
 _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         $pkgname.desktop)
-- 
cgit v1.2.3