[Python-modules-commits] [python-hypothesis] 05/10: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-hypothesis.

commit 98c9f68f84fac6ac742477aa3789fc39561e0a48
Merge: 202beee ac77b37
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Tue Dec 19 23:03:25 2017 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/patches/0001-Delay-__version__-import.patch | 28 ----------------------
 debian/patches/series                              |  1 -
 docs/conf.py                                       |  4 ----
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --cc debian/.git-dpm
index 2ad6989,0000000..f056eef
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e03989772bed13547b4f13e3b77db8b9594d1b6e
- e03989772bed13547b4f13e3b77db8b9594d1b6e
++ac77b37f828c9c25f214db67a45bda7fdc9f865f
++ac77b37f828c9c25f214db67a45bda7fdc9f865f
 +ac77b37f828c9c25f214db67a45bda7fdc9f865f
 +ac77b37f828c9c25f214db67a45bda7fdc9f865f
 +python-hypothesis_3.44.1.orig.tar.gz
 +83fec72102163608d41e6bbe2d155f2ac564b018
 +488917
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-hypothesis.git