fixup to 70b517c: remove errant conflict marker

jj-vcs · May 6, 2024 · 3cf521f · 3cf521f
1 parent 70b517c
commit 3cf521f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,8 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Conflict markers now include an explanation of what each part of the conflict
   represents.
 
-
->>>>>>>
 ### Fixed bugs
 
 ## [0.17.0] - 2024-05-01