From 78dee7b9e5485dc085cf9fa63ba6be3457a3435e Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 9 May 2019 20:46:14 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.05.09.20.46.14"

---
 html/changelog.html                   |  4 +++
 html/changelogs/.all_changelog.yml    |  3 ++
 html/changelogs/MarauderW-PR-6396.yml | 41 ---------------------------
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 html/changelogs/MarauderW-PR-6396.yml

diff --git a/html/changelog.html b/html/changelog.html
index c4a327bf6cd..50be18a8b5f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -62,6 +62,10 @@
 				<li class="imageadd">Added new in-hand sprites as well as added wielded sprites for kinetic accelerators, provided by Kyres1.</li>
 				<li class="tweak">Ultra-heavy kinetic accelerators can no longer be equipped in the belt slot.</li>
 			</ul>
+			<h3 class="author">MarauderW updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Added two banners from New Gibson, a planet in Tau Ceti, representing their flag.</li>
+			</ul>
 			<h3 class="author">ParadoxSpace updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="experiment">Might fix west-facing Vaurca sprite.</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 9e9d6e8d35e..479c90be564 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7873,6 +7873,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       accelerators, provided by Kyres1.
   - tweak: Ultra-heavy kinetic accelerators can no longer be equipped in the belt
       slot.
+  MarauderW:
+  - rscadd: Added two banners from New Gibson, a planet in Tau Ceti, representing
+      their flag.
   ParadoxSpace:
   - experiment: Might fix west-facing Vaurca sprite.
   SonicGotNuked:
diff --git a/html/changelogs/MarauderW-PR-6396.yml b/html/changelogs/MarauderW-PR-6396.yml
deleted file mode 100644
index b30f78dc9f2..00000000000
--- a/html/changelogs/MarauderW-PR-6396.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: MarauderW
-
-# 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: 
-  - rscadd: "Added two banners from New Gibson, a planet in Tau Ceti, representing their flag."