From d95ff154ed31895f3200f7d9c905946f2357d004 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Sun, 7 Aug 2022 08:39:07 +0000
Subject: [PATCH] Remove remaining merge marker

---
 chapter08/binutils.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index 50335ce8b..9f81eb8b4 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -87,7 +87,6 @@ cd       build</userinput></screen>
 
     <para>Prepare Binutils for compilation:</para>
 
-<<<<<<< HEAD
 <screen arch="default"><userinput remap="configure">../configure --prefix=/usr       \
              --sysconfdir=/etc   \
              --enable-gold       \