[mupen64plus-input-sdl] 07/196: Remove unneeded conflict

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 435f52eeeedeb618a9d5406317532a28d9a52256
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Tue Feb 16 13:13:27 2010 +0100

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

diff --git a/debian/control b/debian/control
index af8dfa4..667b07f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,6 @@ Build-Depends: debhelper (>= 7.0.50), libmupen64plus-dev, libsdl1.2-dev
 Package: mupen64plus-input-sdl
 Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mupen64plus (<< 1.99.1)
-Replaces: mupen64plus (<< 1.99.1)
 Provides: mupen64plus-input-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-input-sdl.git