From 02c6f94fb3576734a7f5f62c43c5e6b866dc1fa3 Mon Sep 17 00:00:00 2001 From: Chiirno Date: Thu, 4 Feb 2021 20:04:39 -0400 Subject: [PATCH] why was the changelog changed --- html/changelogs/.all_changelog.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3d2937bf1f..6db77b0bb0 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -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]