From 1e73f373d83c5a47cc16dca785a9125ad7d68956 Mon Sep 17 00:00:00 2001 From: Stephan Heunis Date: Tue, 13 Sep 2022 16:54:37 +0200 Subject: [PATCH] Update CHANGELOG.md --- CHANGELOG.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3260027c..9b32104f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ # 0.1.1 (Tue Sept 13 2022) -- release continued #### 💫 Enhancements and new features -<<<<<<< HEAD - Adds automated workflow for PyPI release. [#197](/~https://github.com/datalad/datalad-catalog/pull/197) (by @jsheunis) #### 📝 Documentation @@ -9,15 +8,6 @@ #### 🛡 Tests - Updates appveyor setup to run tests with `pytest` [#197](/~https://github.com/datalad/datalad-catalog/pull/197) (by @jsheunis) -======= -- Adds automated workflow for PyPI release. [#pr](pr-url) (by @jsheunis) - -#### 📝 Documentation -- Adds CHANGELOG. [#pr](pr-url) (by @jsheunis) - -#### 🛡 Tests -- Updates appveyor setup to run tests with `pytest` [#pr](pr-url) (by @jsheunis) ->>>>>>> f72dca00363164db3c5ed0a1c196335de66ea831 #### Authors: 1 @@ -62,4 +52,4 @@ #### Authors: 1 -- Stephan Heunis (@jsheunis) --> \ No newline at end of file +- Stephan Heunis (@jsheunis) -->