From 9fe517f4b6885bf3e6fff4e4b63a4519a2a4b3f6 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Wed, 9 Oct 2019 18:25:08 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.10.09.18.25.08"

---
 html/changelog.html                |  5 ++++
 html/changelogs/.all_changelog.yml |  3 +++
 html/changelogs/borgs?!.yml        | 42 ------------------------------
 3 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 html/changelogs/borgs?!.yml

diff --git a/html/changelog.html b/html/changelog.html
index 8d40cd4f1c9..6d27a427585 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -44,6 +44,11 @@
 			<ul class="changes bgimages16">
 				<li class="bugfix">Made character preview have white-ish background.</li>
 			</ul>
+			<h3 class="author">SonicGotNuked updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">Traitor borgs now can toggle their overclock.</li>
+				<li class="rscadd">Readded the ancient Reset Identity Codes command</li>
+			</ul>
 			<h3 class="author">aleksix updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Farmbot UI now properly shows pest eradication status</li>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index c1cecd6cef8..447a3a9e108 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9279,6 +9279,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       as body markings and some hair options.
   Karolis2011:
   - bugfix: Made character preview have white-ish background.
+  SonicGotNuked:
+  - rscadd: Traitor borgs now can toggle their overclock.
+  - rscadd: Readded the ancient Reset Identity Codes command
   aleksix:
   - bugfix: Farmbot UI now properly shows pest eradication status
   - bugfix: All-In-One Grinders won't show their UI to people outside their range
diff --git a/html/changelogs/borgs?!.yml b/html/changelogs/borgs?!.yml
deleted file mode 100644
index 68c66df163f..00000000000
--- a/html/changelogs/borgs?!.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: SonicGotNuked
-
-# 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: "Traitor borgs now can toggle their overclock."
-  - rscadd: "Readded the ancient Reset Identity Codes command"