Update CHANGELOG.md

datalad · Sep 13, 2022 · 1e73f37 · 1e73f37
1 parent 70082ae
commit 1e73f37
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,23 +1,13 @@
 # 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
 - Adds CHANGELOG. [#197](https://github.com/datalad/datalad-catalog/pull/197) (by @jsheunis)
 
 #### 🛡 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) -->
+- Stephan Heunis (@jsheunis) -->