[lfs] 03/04: Solve merge conflict

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

git pushed a commit to branch multilib
in repository lfs.

commit c6536b6710eec90b43982dae1f3008791ad4a741
Merge: 17a8f46f3 ea4845640
Author: Thomas Trepl <[email protected]>
AuthorDate: Wed Dec 4 09:34:04 2024 +0100

    Solve merge conflict

 chapter01/changelog.xml | 34 ++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  |  4 ++--
 chapter08/iproute2.xml  |  4 ++--
 packages.ent            | 44 ++++++++++++++++++++++----------------------
 4 files changed, 60 insertions(+), 26 deletions(-)

diff --cc chapter01/changelog.xml
index 5333ea8e4,cdb245999..ef65ba57a
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@@ -40,15 -40,40 +40,49 @@@
      appropriate for the entry or if needed the entire day's listitem.
      -->
  
+     <listitem>
+       <para>2024-12-01</para>
+       <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Update to iana-etc-20241122. Addresses
+           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to file-5.46. Fixes
+           <ulink url='&lfs-ticket-root;5601'>#5601</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to iproute2-6.12.0. Fixes
+           <ulink url='&lfs-ticket-root;5597'>#5597</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to libtool-2.5.4. Fixes
+           <ulink url='&lfs-ticket-root;5598'>#5598</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to linux-6.12.1. Fixes
+           <ulink url='&lfs-ticket-root;5596'>#5586</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to setuptools-75.6.0 (Python Module). Fixes
+           <ulink url='&lfs-ticket-root;5599'>#5599</ulink>.</para>
+         </listitem>
+         <listitem>
+           <para>[bdubbs] - Update to wheel-0.45.1 (Python Module). Fixes
+           <ulink url='&lfs-ticket-root;5600'>#5600</ulink>.</para>
+         </listitem>
+       </itemizedlist>
+     </listitem>
+ 
 +    <listitem>
 +      <para>2024-11-18</para>
 +      <itemizedlist>
 +        <listitem>
 +          <para>[thomas] - Upgrade to isl-0.27.</para>
 +        </listitem>
 +      </itemizedlist>
 +    </listitem>
 +
      <listitem>
        <para>2024-11-15</para>
        <itemizedlist>

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