From e1d2c914720dff90a67044a1ebff2ae7f4b0b8f7 Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Fri, 4 Jan 2019 23:53:25 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.01.04.23.53.25"

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

diff --git a/html/changelog.html b/html/changelog.html
index 3f366a19954..bed302c161e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -65,6 +65,7 @@
 			<h3 class="author">Conspiir updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Cargo lobby now has a photocopier instead of a library book scanner.</li>
+				<li class="rscadd">Fingerprint cards can now go in folders.</li>
 			</ul>
 			<h3 class="author">Drago updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index e9c5708f71e..8a5edc001fd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7025,5 +7025,6 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: You can now attach bayonets to the icelance rifle.
   Conspiir:
   - bugfix: Cargo lobby now has a photocopier instead of a library book scanner.
+  - rscadd: Fingerprint cards can now go in folders.
   Drago:
   - bugfix: Fixes cryopods to where you can no longer fall through the floor
diff --git a/html/changelogs/fingerprintcards.yml b/html/changelogs/fingerprintcards.yml
deleted file mode 100644
index 2fd2211839f..00000000000
--- a/html/changelogs/fingerprintcards.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: Conspiir
-
-# 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: "Fingerprint cards can now go in folders."
\ No newline at end of file