From ae4e4f22c437e647ff2852f9abe93eff56d6d30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 31 Aug 2015 15:57:11 +0200 Subject: [PATCH] maintenance branch is now 1.2.6-dev --- .versioneer-lookup | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index db6d9a7b..02649029 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -10,10 +10,10 @@ # master shall not use the lookup table, only tags master -# maintenance is currently the branch for preparation of maintenance release 1.2.5 +# maintenance is currently the branch for preparation of maintenance release 1.2.6 # so are any fix/... branches -maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c -fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c +maintenance 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a +fix/.* 1.2.6-dev 96fc70bdb2dd74ba04c3071f70da385b0408904a # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0-dev 198d3450d94be1a2