Remove remaining merge marker

This commit is contained in:
Thomas Trepl 2022-08-07 08:39:07 +00:00
parent f4e814c2e9
commit d95ff154ed

View File

@ -87,7 +87,6 @@ cd build</userinput></screen>
<para>Prepare Binutils for compilation:</para> <para>Prepare Binutils for compilation:</para>
<<<<<<< HEAD
<screen arch="default"><userinput remap="configure">../configure --prefix=/usr \ <screen arch="default"><userinput remap="configure">../configure --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--enable-gold \ --enable-gold \