From b0c9f56999e2794390dd6c6dfb0034a9f3672692 Mon Sep 17 00:00:00 2001
From: DeltaV-Bot <github@delta-v.org>
Date: Sun, 18 Feb 2024 23:06:04 +0000
Subject: [PATCH] Automatic Changelog Update (#857)

---
 Resources/Changelog/DeltaVChangelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index 03752eaef15..7e3b668d939 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1666,3 +1666,11 @@ Entries:
       message: 'Metempsychosis machines have been added to the game. '
   id: 248
   time: '2024-02-18T02:36:16.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Add
+      message: Merged upstream
+    - type: Fix
+      message: Fixed the upstream changelog not rendering
+  id: 249
+  time: '2024-02-18T23:05:48.0000000+00:00'