From 3cf521fb413f7b72446b90b283313e26acd38157 Mon Sep 17 00:00:00 2001
From: Ilya Grigoriev <ilyagr@users.noreply.github.com>
Date: Sun, 5 May 2024 18:51:18 -0700
Subject: [PATCH] fixup to 70b517c: remove errant conflict marker

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c653ef5d5..9700c7f75 100644
--- 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