Ignore:
Timestamp:
03/05/2023 10:14:49 AM (14 months ago)
Author:
Thomas Trepl <thomas@…>
Branches:
multilib
Children:
d09e490
Parents:
d8bc5bd (diff), 73e2b9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fix conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • chapter01/changelog.xml

    rd8bc5bd r4e897cf  
    4141    -->
    4242    <listitem>
     43      <para>2023-03-04</para>
     44      <itemizedlist>
     45        <listitem>
     46          <para>[bdubbs] - Change to a better host requirements script in Chapter 2.</para>
     47        </listitem>
     48      </itemizedlist>
     49    </listitem>
     50
     51    <listitem>
    4352      <para>2023-03-01</para>
    4453      <itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.