From ff3f3d786e3b321c0fa533db877e1073d8bf2741 Mon Sep 17 00:00:00 2001
From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Thu, 7 Nov 2024 21:09:45 +0100
Subject: [PATCH] Automatic changelog update

---
 Resources/Changelog/DeltaVChangelog.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index 66fbd1d719..3c86e1323d 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,13 +1,4 @@
 Entries:
-- author: luringens
-  changes:
-  - message: Prisoners are back!
-    type: Add
-  - message: Gladiators, prisoners and prison guards start the shift at their predesignated
-      locations.
-    type: Fix
-  id: 156
-  time: '2023-12-06T15:54:37.0000000+00:00'
 - author: Tryded
   changes:
   - message: Added energy guns to dynamic protolathe emagable recipes.
@@ -3714,3 +3705,10 @@
   id: 655
   time: '2024-11-07T20:07:57.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2126
+- author: deltanedas
+  changes:
+  - message: Merged this week's changes from upstream.
+    type: Add
+  id: 656
+  time: '2024-11-07T20:09:26.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2090