From 5bebbde600e7c14ba6ef5dedddc7d69ebd35c5f4 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sat, 6 Jun 2020 18:59:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.06.06.18.59.09"

---
 html/changelog.html                      |  1 +
 html/changelogs/.all_changelog.yml       |  2 ++
 html/changelogs/mattatlas-flashbangs.yml | 41 ------------------------
 3 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/mattatlas-flashbangs.yml

diff --git a/html/changelog.html b/html/changelog.html
index 2cd6b7fb8db..5011b6d3630 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -40,6 +40,7 @@
 			<ul class="changes bgimages16">
 				<li class="rscdel">Spy vs. Spy has been removed as a playable gamemode.</li>
 				<li class="bugfix">Stasis bags should no longer basically instantly kill people.</li>
+				<li class="bugfix">Added a changelog editing system that should cause fewer conflicts and more accurate timestamps.</li>
 			</ul>
 			<h3 class="author">Wowzewow (Wezzy) updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e76ab3e4c70..b888fc663ef 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -13498,6 +13498,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   MattAtlas:
   - rscdel: Spy vs. Spy has been removed as a playable gamemode.
   - bugfix: Stasis bags should no longer basically instantly kill people.
+  - bugfix: Added a changelog editing system that should cause fewer conflicts and
+      more accurate timestamps.
   Wowzewow (Wezzy):
   - bugfix: Actually removes the unused female suit from code properly.
   - rscadd: Adds pleated skirts to the loadout.
diff --git a/html/changelogs/mattatlas-flashbangs.yml b/html/changelogs/mattatlas-flashbangs.yml
deleted file mode 100644
index 338972ff3ba..00000000000
--- a/html/changelogs/mattatlas-flashbangs.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-################################
-# Example Changelog File
-#
-# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
-#
-# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
-# When it is, any changes listed below will disappear.
-#
-# Valid Prefixes: 
-#   bugfix
-#   wip (For works in progress)
-#   tweak
-#   soundadd
-#   sounddel
-#   rscadd (general adding of nice things)
-#   rscdel (general deleting of nice things)
-#   imageadd
-#   imagedel
-#   maptweak
-#   spellcheck (typo fixes)
-#   experiment
-#   balance
-#   admin
-#   backend
-#   security
-#   refactor
-#################################
-
-# Your name.  
-author: MattAtlas
-
-# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made.  See valid prefix list above.
-# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
-# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
-changes: 
-  - bugfix: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps."