diff options
| author | nl6720 <nl6720@gmail.com> | 2023-05-17 17:36:27 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2023-05-17 17:36:59 +0300 |
| commit | 7f1632334bd4a1a3a69af68baca338eec09e643b (patch) | |
| tree | a0881883db4e36684eec270c03e28d304155c309 /CHANGELOG.rst | |
| parent | 493aa90fd2250ebfe37598eb933550e635adbc4b (diff) | |
| download | archiso-7f1632334bd4a1a3a69af68baca338eec09e643b.tar.gz archiso-7f1632334bd4a1a3a69af68baca338eec09e643b.tar.bz2 | |
CHANGELOG.rst: remove stray git conflict marker
Fixes 8cc0e9e5b09d504a50701a825f0ab9992ed73b6f
Diffstat (limited to 'CHANGELOG.rst')
| -rw-r--r-- | CHANGELOG.rst | 1 |
1 files changed, 0 insertions, 1 deletions
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. |