minor tweak to changelog files, for contributor sanity (#40643)

deconflict changelog file order

diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml
index b2ebdecbfde2362f7b03a84131de2b9ce879aa5f..474a16da3a8636a1e55dc59d5da71cbd366d9252 100644 (file)
--- 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 8d99b59f78504c193855022482fdc168f772ac06..603ebfd2ea976c85fb8d7342a651025038f3f43d 100644 (file)
--- 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 0c8783e4a50ea0c14c25446f6915611e9642910a..557a260ac426e606f81c6715d197409340fb3a7e 100644 (file)
--- 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