[med-svn] [pymia] 02/04: correct conflicts

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository pymia.

commit 3a6ead2e3c4ad7599b473b065af8740b7acd9faf
Merge: 1aba120 c538d1b
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Oct 27 18:56:42 2015 +0100

    correct conflicts

 debian/changelog | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 4ad58ac,aad6b52..e5867f7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,13 +1,13 @@@
- pymia (0.1.7-1) unstable; urgency=medium
+ pymia (0.1.7-2) UNRELEASED; urgency=medium
+ 
+   * upload the experimental version to unstable
+ 
+  -- Gert Wollny <gw.fossdev at gmail.com>  Tue, 27 Oct 2015 17:58:35 +0100
+ 
+ pymia (0.1.7-1) experimental; urgency=medium
  
    * New upstream release 
 -  * Remnove patch for oldstyle c++11 invocation
 +  * Remove patch for oldstyle c++11 invocation
    * d/control: Update standarts version tp 3.9.6 
  
   -- Gert Wollny <gw.fossdev at gmail.com>  Fri, 16 Jan 2015 16:11:26 +0100

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