From 7f1632334bd4a1a3a69af68baca338eec09e643b Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 17 May 2023 17:36:27 +0300 Subject: CHANGELOG.rst: remove stray git conflict marker Fixes 8cc0e9e5b09d504a50701a825f0ab9992ed73b6f --- CHANGELOG.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7295875..53b8c47 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -25,7 +25,6 @@ Deprecated Fixed ----- -<<<<<<< HEAD - Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=`` boot parameter. - Subdirectories from ``grub/`` are copied to the ISO. -- cgit v1.2.3-54-g00ecf