Fix changelog formatting

EvanHahn · Jun 24, 2020 · 82bead8 · 82bead8
1 parent a2b4ec3
commit 82bead8
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,15 +1,12 @@
-<<<<<<< HEAD
-
-# 3.23.1 / 2020-06-11
-
-- change: removed extra check when humanizing Arabic
-- # change: simplify logic for Latvian
-
 # Unreleased
 
 - remove: `fallbacks` option
 - remove: `gr` language code (see [#174](https://github.com/EvanHahn/HumanizeDuration.js/issues/174))
-  > > > > > > > eaf8527... Remove `gr` language code
+
+# 3.23.1 / 2020-06-11
+
+- change: removed extra check when humanizing Arabic
+- change: simplify logic for Latvian
 
 # 3.23.0 / 2020-05-21