[Pkg-mozext-commits] [SCM] Advertisement filter extension for the Iceweasel/Iceape branch, master, updated. debian/2.2.4-1-15-g70dd58f

[David Prévot]

The following commit has been merged in the master branch:
commit 7507a004cbcf265d06d76dc8e2d24785654a00c4
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 11 17:26:27 2013 -0400

    Remove now useless Conflicts
    
    mozilla-firefox-adblock was last seen in Lenny (archived).

diff --git a/debian/control b/debian/control
index 3b19b58..b648438 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Depends: ${misc:Depends}, ${xpi:Depends}
 Recommends: ${xpi:Recommends}
 Provides: ${xpi:Provides}
 Enhances: ${xpi:Enhances}
-Conflicts: mozilla-firefox-adblock
 Breaks: adblock-plus (<< 1.1.1-2), ${xpi:Breaks}
 Replaces: adblock-plus (<< 1.1.1-2)
 Description: advertisement blocking extension for web browsers

-- 
Advertisement filter extension for the Iceweasel/Iceape