From 528192b3c0466cead641b5e8d41a5a3d90a4528a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 23 Oct 2015 09:55:14 +0200 Subject: [PATCH] Fixed a merge error while migrating versioneer update --- .versioneer-lookup | 3 --- 1 file changed, 3 deletions(-) diff --git a/.versioneer-lookup b/.versioneer-lookup index 11b214ac..0ffcdd87 100644 --- a/.versioneer-lookup +++ b/.versioneer-lookup @@ -18,8 +18,5 @@ fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev # Special case disconnected checkouts, e.g. 'git checkout ' \(detached.* -# Special case disconnected checkouts, e.g. 'git checkout ' -\(detached.* - # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now .* 1.3.0 198d3450d94be1a2 pep440-dev