[Scummvm-git-logs] scummvm-web master -> 5b9302a28c63edaecdccb708263891e023f3198e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://api.github.com/repos/scummvm/scummvm-web .

Summary:
5b9302a28c NEWS: Fix the accidentall mess


Commit: 5b9302a28c63edaecdccb708263891e023f3198e
    https://github.com/scummvm/scummvm-web/commit/5b9302a28c63edaecdccb708263891e023f3198e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-09-30T23:10:20+02:00

Commit Message:
NEWS: Fix the accidentall mess

Changed paths:
    data/en/news/20260930.markdown


diff --git a/data/en/news/20260930.markdown b/data/en/news/20260930.markdown
index d3463f77..df16d8ed 100644
--- a/data/en/news/20260930.markdown
+++ b/data/en/news/20260930.markdown
@@ -6,11 +6,7 @@ date: 1790800295
 
 ![Amerzone screenshot](https://www.scummvm.org/data/screenshots/phoenixvr/amerzone/amerzone_win_en_1_2.jpg)
 
-<<<<<<< HEAD
-The ScummVM Team is pleased to announce that _Amerzone: The Explorer’s Legacy_, _Loch Ness_, and _The Messenger_ / _Louvre: The Final Curse_ are ready for public testing!
-=======
 The ScummVM Team is pleased to announce that _Amerzone: The Explorer’s Legacy_, _The Cameron Files: The Secret at Loch Ness_, and _The Messenger_ / _Louvre: The Final Curse_ are ready for public testing!
->>>>>>> 6cf47bcd (NEWS: Added another phoenixvr announcement, for three games)
 
 In _Amerzone: The Explorer’s Legacy_, an old explorer’s final wish sends a young journalist to a hidden land with some precious cargo: the stolen egg of the legendary White Birds. Sail, drive, and puzzle your way through Benoît Sokal’s world of strange wildlife, rusting machinery, and forgotten history.