From 5450dea450a0b53576f4fa019c7b60499e33b982 Mon Sep 17 00:00:00 2001
From: Errant <35878406+Errant-4@users.noreply.github.com>
Date: Sat, 11 Oct 2025 16:20:27 +0200
Subject: [PATCH] minor tweak to changelog files, for contributor sanity
 (#40643)

deconflict changelog file order
---
 Resources/Changelog/Admin.yml     | 5 +++--
 Resources/Changelog/Changelog.yml | 3 ++-
 Resources/Changelog/Maps.yml      | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b2ebdecbfd..474a16da3a 100644
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@@ -1,4 +1,7 @@
 AdminOnly: true
+Name: Admin
+Order: 2
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
 Entries:
 - author: DrSmugleaf
   changes:
@@ -1461,5 +1464,3 @@ Entries:
   id: 177
   time: '2025-10-05T07:40:15.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40709
-Name: Admin
-Order: 2
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8d99b59f78..603ebfd2ea 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,4 +1,5 @@
-Entries:
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The TEG's efficiency in extracting power from gasses has been tweaked
diff --git a/Resources/Changelog/Maps.yml b/Resources/Changelog/Maps.yml
index 0c8783e4a5..557a260ac4 100644
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@@ -1,4 +1,6 @@
-Entries:
+Order: 1
+# Do NOT put anything after the Entries section, in order to prevent merge conflict with new CL entries
+Entries:
 - author: ArtisticRoomba
   changes:
   - message: The mapping changelog has been added! This primarily serves as a way
@@ -778,4 +780,3 @@
   id: 94
   time: '2025-10-10T20:33:03.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/40821
-Order: 1
-- 
2.51.2