[lfs] branch multilib updated: Fix xml merge error.
"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]> Wed, 03 Jun 2026 15:51:50 +0000
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <178050191069.2770.13939329669629178710@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch multilib
in repository lfs.
The following commit(s) were added to refs/heads/multilib by this push:
new a59bad31e Fix xml merge error.
a59bad31e is described below
commit a59bad31ed2f8a92afbdb4edefaea8be905689c6
Author: Bruce Dubbs <[email protected]>
AuthorDate: Wed Jun 3 10:51:45 2026 -0500
Fix xml merge error.
---
chapter06/gcc-pass2.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index e3afc3960..0ae4f1039 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -76,7 +76,6 @@ cd build</userinput></screen>
<para>Now prepare GCC for compilation:</para>
-<<<<<<< HEAD
<screen><userinput remap="configure">../configure \
--build=$(../config.guess) \
--host=$LFS_TGT \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page