fix changelog (#143)

DS-13-Dev-Team · Sep 10, 2023 · f2d3393 · f2d3393
1 parent cfbaaaf
commit f2d3393
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/html/changelogs/archive/2023-09.yml b/html/changelogs/archive/2023-09.yml
@@ -35,8 +35,6 @@
   yyzsong:
   - rscadd: Chemistry gets a grinder and plasma by default
   - qol: updates beaker transfer amounts for the multiple-of-sixtyening.
-<<<<<<< HEAD
-=======
 2023-09-04:
   Kapu1178:
   - qol: Updated the changelog to include Daedalus contributors.
@@ -54,4 +52,3 @@
       get too close. Security has a private hog.
   - rscdel: Sgt. Araneus and Paperwork have been sent off to kindly old spaceman's
       farm, where they will happily live out the rest of their natural lives.
->>>>>>> master