cleanup from merge conflict

svalinn · Aug 13, 2023 · 0534936 · 0534936
1 parent 5598d13
commit 0534936
Showing 1 changed file with 1 addition and 27 deletions.
diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
@@ -46,33 +46,7 @@ v3.2.1
 
 **Added:**
 
-   * Added link to latest Conda package in GitHub README.md
-
-**Changed:**
-
-**Deprecated:**
-
-**Removed:**
-
-**Fixed:**
-
-**Security:**
-
-**Maintenance:**
-
-
-**Added:**
-
-**Changed:**
-
-**Deprecated:**
-
-**Removed:**
-
-**Fixed:**
-
-**Maintenance:**
-
+   * Added link to latest Conda package in GitHub README.md (#801)
 
 v3.2.1
 ====================