From 29579a2aec06e1972635196b3909c99cba5e808b Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 22 Apr 2021 17:49:34 -0700
Subject: [PATCH] Remove missed merge conflict marker.

---
 changelog.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 80c04472..1247f89d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,7 +6,6 @@
 
 ## Fixes
 
->>>>>>> 208d1b82 (Show BARCAP commit ranges by default.)
 # 2.5.0
 
 Saves from 2.4 are not compatible with 2.5.