[Pkg-running-devel] [SCM] Debian package for pytrainer branch, master, updated. debian/1.10.1-2-6-g98c7ee0

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 0d981c952d43c03ba07e3c8d7a2f304aaa93d23d
Author: Christian PERRIER <bubulle at debian.org>
Date:   Sun May 26 08:08:28 2013 +0300

    Really resolve conflict

diff --git a/debian/changelog b/debian/changelog
index f226c84..68285f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ pytrainer (1.10.1-2) unstable; urgency=low
   * Upload to unstable
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 19 May 2013 14:41:40 +0200
->>>>>>> 2964414e60abda03fe5305645ca371b67f59028a
 
 pytrainer (1.10.1-1) experimental; urgency=low
 

-- 
Debian package for pytrainer