From 843d0617c0af8dc4f22e8fb26580771e8bfdedea Mon Sep 17 00:00:00 2001
From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com>
Date: Mon, 16 Sep 2024 17:41:55 +0200
Subject: [PATCH] Automatic changelog update

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

diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index f448d0ef513..2781be14cc1 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
 Entries:
-- author: Colin-Tel
-  changes:
-  - message: Added Edge Station.
-    type: Add
-  id: 51
-  time: '2023-10-07T05:12:58.0000000+00:00'
 - author: VMSolidus
   changes:
   - message: Scrubs can no longer be obtained from the MediDrobe
@@ -3597,3 +3591,10 @@
   id: 550
   time: '2024-09-15T03:34:07.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1758
+- author: deltanedas
+  changes:
+  - message: Merged upstream changes for this week.
+    type: Add
+  id: 551
+  time: '2024-09-16T15:41:35.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1825