From 4f4929635fa4cafe5df3cc9f55b99068a3d06bd7 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Thu, 6 Dec 2018 11:32:53 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2018.12.06.11.32.53"

---
 html/changelog.html                |  6 +++++
 html/changelogs/.all_changelog.yml |  3 +++
 html/changelogs/Sidnorman-bot2.yml | 37 ------------------------------
 3 files changed, 9 insertions(+), 37 deletions(-)
 delete mode 100644 html/changelogs/Sidnorman-bot2.yml

diff --git a/html/changelog.html b/html/changelog.html
index d73e639816c..adb34019ca4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 December 2018</h2>
+			<h3 class="author">PoZe updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Farmbot can finally be refilled properly.</li>
+			</ul>
+
 			<h2 class="date">05 December 2018</h2>
 			<h3 class="author">PoZe updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 7e2ac3a5d4e..a5d85034326 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -6711,3 +6711,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   PoZe:
   - rscadd: SMES now shows in their UI how much input they taken.
   - rscadd: SMES and APC now show in UI how long it will take to charge/discharge.
+2018-12-06:
+  PoZe:
+  - bugfix: Farmbot can finally be refilled properly.
diff --git a/html/changelogs/Sidnorman-bot2.yml b/html/changelogs/Sidnorman-bot2.yml
deleted file mode 100644
index 224524ed793..00000000000
--- a/html/changelogs/Sidnorman-bot2.yml
+++ /dev/null
@@ -1,37 +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
-#################################
-
-# Your name.
-author: PoZe
-
-# 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: "Farmbot can finally be refilled properly."