[SCM] tap-plugins-doc packaging branch, master, updated. debian/20040817-2-2-g885ff4c

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 885ff4c875c0d687ee7a8f9d5514cc8115ede130
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Thu May 20 20:40:00 2010 +0200

    Remove Conflicts field (thank you, Reinhard)

diff --git a/debian/control b/debian/control
index bb690d0..7211d08 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Package: tap-plugins-doc
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: tap-plugins (<< 0.7.1-1)
-Conflicts: tap-plugins (<< 0.7.1-1)
 Description: TAP-plugins documentation
  Tom's Audio Processing LADSPA plugins
  Tom Szilagyi has written a number of plugins for LADSPA

-- 
tap-plugins-doc packaging