[med-svn] [Git][med-team/mia][master] 2 commits: d/changelog: remove conflict marker

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / mia


Commits:
fbf6dbda by Gert Wollny at 2019-10-23T07:15:21Z
d/changelog: remove conflict marker

- - - - -
447c9ce1 by Gert Wollny at 2019-10-23T09:19:07Z
d/changelog: Update for upload

- - - - -


1 changed file:

- debian/changelog


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-mia (2.4.6-5) UNRELEASED; urgency=medium
+mia (2.4.6-5) unstable; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Trim trailing whitespace.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Wed, 17 Oct 2018 22:23:51 +0000
+  [ Gert Wollny ]
+  * d/control: Switch dependencies to python3 Closes: #943114
+
+ -- Gert Wollny <gewo at debian.org>  Wed, 23 Oct 2019 11:00:04 +0200
 
 mia (2.4.6-4) unstable; urgency=medium
 
@@ -10,7 +14,6 @@ mia (2.4.6-4) unstable; urgency=medium
   * d/rules: remove dh_builddeb -- -Z xz
 
  -- Gert Wollny <gewo at debian.org>  Sat, 12 Jan 2019 19:20:36 +0100
->>>>>>> Update changelog for new upload
 
 mia (2.4.6-3) unstable; urgency=medium
 



View it on GitLab: https://salsa.debian.org/med-team/mia/compare/004d58b4d594952e7591b98626c9d2be2ae9a90c...447c9ce119ba91b68704e04e31132201d2000743

-- 
View it on GitLab: https://salsa.debian.org/med-team/mia/compare/004d58b4d594952e7591b98626c9d2be2ae9a90c...447c9ce119ba91b68704e04e31132201d2000743
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191023/e8882bd8/attachment-0001.html>