Changeset 9ee05b53

Timestamp:

09/07/2021 09:25:03 PM (21 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, bdubbs/gcc13, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008

Children:

2da01379

Parents:

3781c69

Message:

Remove merge conflicts marks in chapter07/cleanup.xml

File:

• chapter07/cleanup.xml (modified) (3 diffs)

chapter07/cleanup.xml

@@ -106 +106 @@
 
     <para>
-<<<<<<< HEAD
-      Make sure you have at least 1 GB free disk space (the source tarballs
-      will be included in the backup archive) in the home directory of user
-      <systemitem class="username">root</systemitem>.
-=======
       Note that the instructions below specify the home directory of the host
       system's <systemitem class="username">root</systemitem> user, which is
       typically found on the root filesystem.
->>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </para>
 
@@ -132 +126 @@
           long time (over 10 minutes) even on a resonably fast system.
        </para>
-<<<<<<< HEAD
-
-       <para>
-          Also, ensure the <envar>LFS</envar> environment variable is set
-          for the root user.
-       </para>
-=======
->>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
     </note>
 
@@ -148 +134 @@
 tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen>
 
-<<<<<<< HEAD
-    <para>
-      Replace <envar>$HOME</envar> by a directory of your choice if you
-      do not want to have the backup stored in <systemitem
-      class="username">root</systemitem>'s home directory.
-    </para>
-=======
->>>>>>> 8e6babecd0d75542a01eedfde32556879733f842
   </sect2>