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.