[lfs] 02/02: Resolve merge conflict

"Git Owner" ([email protected] via lfs-book Mailing List) <[email protected]> Thu, 06 Mar 2025 06:00:56 +0000

Newsgroups	gmane.linux.lfs.book
Message-ID	<[email protected]>

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch multilib
in repository lfs.

commit 9f8dcf0340a5d8f2ab8a7cb52a76d2ad77cddb0d
Merge: 92489e909 4200e0961
Author: Thomas Trepl <[email protected]>
AuthorDate: Wed Mar 5 03:50:22 2025 +0100

    Resolve merge conflict

 chapter01/changelog.xml | 609 ------------------------------------------------
 chapter01/whatsnew.xml  | 200 ++++++++--------
 2 files changed, 100 insertions(+), 709 deletions(-)


-- 
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