Fix merge of changelog.

FGlazov · Nov 4, 2021 · ddfb3e3 · ddfb3e3
1 parent 6ac2498
commit ddfb3e3
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -187,12 +187,8 @@ Version 1.8.3
 
 Version 1.8.4
 
-<<<<<<< HEAD
 - Update to 1.2.58 of IL2 Stats
-=======
-- Update to 1.2.57 of IL2 Stats.
 
-Version 2.3.2
+Version 1.8.5
 
-- Module Ammo breakdown: Fix rare bug where stats parser would crash if there was a hit registered in the DServer logs with a bullet/shell projectile that did not have an attacker.
->>>>>>> 2.3
+- Update to 2.3.2 of enhancements.