From 14e9afbe22af2496209f8ccab94fb5cfe9498e24 Mon Sep 17 00:00:00 2001 From: Mackey22 Date: Tue, 1 Aug 2017 22:19:17 -0700 Subject: [PATCH] v0.7.2 --- Changes.rst | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changes.rst b/Changes.rst index 68738707..6f1bc7a0 100644 --- a/Changes.rst +++ b/Changes.rst @@ -1,3 +1,8 @@ +Changes for v0.7.2 (2017-08-01) +=============================== + +Remove merge conflict lines. + Changes for v0.7.1 (2017-08-01) =============================== diff --git a/setup.py b/setup.py index 983cbe3c..1a35ff93 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name="hca", - version="0.7.1", + version="0.7.2", url='https://github.com/HumanCellAtlas/data-store-cli', license='Apache Software License', author='Human Cell Atlas contributors',