From 0ea0b7cbc1dfe40eb65fc325a2841ea8c533c84a Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 9 Feb 2020 09:19:31 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2020.02.09.09.19.31"

---
 html/changelog.html                      |  1 +
 html/changelogs/.all_changelog.yml       |  1 +
 html/changelogs/AMORYBLAINE-BADGEFIX.yml | 42 ------------------------
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/AMORYBLAINE-BADGEFIX.yml

diff --git a/html/changelog.html b/html/changelog.html
index b077ec80aa9..14e7331aad9 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -39,6 +39,7 @@
 			<h3 class="author">AmoryBlaine updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Resprited folders.</li>
+				<li class="tweak">Fixes holobadge placement.</li>
 			</ul>
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 05c9470b2b8..71bd56fe29d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -11737,6 +11737,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2020-02-09:
   AmoryBlaine:
   - rscadd: Resprited folders.
+  - tweak: Fixes holobadge placement.
   mikomyazaki:
   - bugfix: Fixes some bugs with GPSes that caused 'track all' and other features
       to function incorrectly sometimes.
diff --git a/html/changelogs/AMORYBLAINE-BADGEFIX.yml b/html/changelogs/AMORYBLAINE-BADGEFIX.yml
deleted file mode 100644
index c51bb3f2302..00000000000
--- a/html/changelogs/AMORYBLAINE-BADGEFIX.yml
+++ /dev/null
@@ -1,42 +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: AmoryBlaine
-
-# 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: 
-  - tweak: "Fixes holobadge placement."
-