why was the changelog changed

2021-02-04 20:04:39 -04:00
parent e58f170057
commit 02c6f94fb3
1 changed files with 0 additions and 5 deletions
@@ -28361,7 +28361,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-01-31:
  Putnam3145:
  - balance: fermichem explosion EMPs don't cover the entire station
-<<<<<<< HEAD
 2021-02-02:
  silicons:
  - rscadd: pais can now be carried around piggybacking/fireman
@@ -28369,7 +28368,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2021-02-03:
  Hatterhat:
  - bugfix: The green energy sabre's sprite now respects proper handedness.
-=======
->>>>>>> 5ad3b97dc1... yesss?
-=======
->>>>>>> 80a0033e5f... Automatic changelog compile [ci skip]