[mupen64plus-video-rice] 07/191: Remove unneeded conflict

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit b0e73fd34d5971c3be22a91c6e6d85bb296733d4
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Feb 16 13:14:26 2010 +0100

    Remove unneeded conflict
---
 debian/control | 2 --
 1 file changed, 2 deletions(-)

diff --git a/debian/control b/debian/control
index 74f56dc..9115b8d 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,6 @@ Build-Depends: debhelper (>= 7.0.50), libmupen64plus-dev, libsdl1.2-dev,
 Package: mupen64plus-video-rice
 Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mupen64plus (<< 1.99.1)
-Replaces: mupen64plus (<< 1.99.1)
 Provides: mupen64plus-video-1
 Description: plugin-based Nintendo 64 emulator
  N64 Emulator for Linux that works with many ROMs that are publically available.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git