Fixed a merge error while migrating versioneer update

This commit is contained in:
Gina Häußge 2015-10-23 09:55:14 +02:00
parent 729d23b2c0
commit 528192b3c0

View file

@ -18,8 +18,5 @@ fix/.* 1.2.8 6c622f7c4332b71c6ece59552ffc87c146155c84 pep440-dev
# Special case disconnected checkouts, e.g. 'git checkout <tag>'
\(detached.*
# Special case disconnected checkouts, e.g. 'git checkout <tag>'
\(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