From 5f5ed5eff293f3d35e350c27767cabcdd1eafd9f Mon Sep 17 00:00:00 2001
From: AuroraBuildBot <buildbot@aurorastation.org>
Date: Sun, 2 Jun 2019 12:29:09 +0000
Subject: [PATCH] "[ci skip] Automatic Build - 2019.06.02.12.29.09"

---
 html/changelog.html                        |  6 ++++++
 html/changelogs/.all_changelog.yml         |  4 ++++
 html/changelogs/carded-ai-may-not-wipe.yml | 14 --------------
 3 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 html/changelogs/carded-ai-may-not-wipe.yml

diff --git a/html/changelog.html b/html/changelog.html
index be2d6243043..a623203b1c1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,12 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">02 June 2019</h2>
+			<h3 class="author">Rhicora updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Carded intelligences may no longer wipe themselves, but may ahelp to have it done for them if needed.</li>
+			</ul>
+
 			<h2 class="date">01 June 2019</h2>
 			<h3 class="author">Alberyk, Kyres1 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 71b32c4634f..25a65d45d9b 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -8058,3 +8058,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2019-06-01:
   Alberyk, Kyres1:
   - rscadd: Added two new space ruins.
+2019-06-02:
+  Rhicora:
+  - tweak: Carded intelligences may no longer wipe themselves, but may ahelp to have
+      it done for them if needed.
diff --git a/html/changelogs/carded-ai-may-not-wipe.yml b/html/changelogs/carded-ai-may-not-wipe.yml
deleted file mode 100644
index 37b33bcbdb7..00000000000
--- a/html/changelogs/carded-ai-may-not-wipe.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Your name.  
-author: Rhicora
-
-# 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: "Carded intelligences may no longer wipe themselves, but may ahelp to have it done for them if needed."