[jabref] 09/459: rm Conflicts from debian/control

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit d9a6c59f58d3231db196c5b6808fd3958ffd4218
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 20 16:02:36 2006 +0000

    rm Conflicts from debian/control
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 25da924..f6f68cf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Standards-Version: 3.7.2
 Package: jabref
 Architecture: all
 Depends: sun-java5-jre | java2-runtime 
-Conflicts: kaffe
 Description: graphical frontend to manage BibTeX databases
  JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography
  reference format. JabRef is build to be platform independent (requires Java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git