faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHANGELOG.rst: remove stray git conflict marker

Browse Source 
Fixes 8cc0e9e5b0
This commit is contained in:
nl6720 2023-05-17 17:36:27 +03:00
parent 493aa90fd2
commit 7f1632334b
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -25,7 +25,6 @@ Deprecated
Fixed Fixed
----- -----
<<<<<<< HEAD
- Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=`` - Wait for ``network-online.target`` to become active before trying to download the script passed via the ``script=``
boot parameter. boot parameter.
- Subdirectories from ``grub/`` are copied to the ISO. - Subdirectories from ``grub/`` are copied to the ISO.