[med-svn] [fast5] 01/01: Corrected for left-over conflict declaration.

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository fast5.

commit 008c7def9444c98177fc4803a7e7218866816331
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Sep 15 18:32:02 2017 +0200

    Corrected for left-over conflict declaration.
---
 debian/changelog | 7 +++++++
 debian/control   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ad6b400..c8c8b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fast5 (0.6.2-2) unstable; urgency=medium
+
+  * Corrected for erroneously declared conflict
+    between python3-fast5 and python-fast5.
+
+ -- Steffen Moeller <moeller at debian.org>  Fri, 15 Sep 2017 18:19:20 +0200
+
 fast5 (0.6.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index eeac9d8..67700a3 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,6 @@ Description: executables of the Oxford Nanopore Fast5 library
 
 Package: python3-fast5
 Section: python
-Conflicts: python-fast5
 Architecture: any
 Depends:
 	${shlibs:Depends},

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fast5.git