From 2198b5efa016c5441c83324f50c20d0052790e45 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Wed, 15 Sep 2021 09:54:13 +0200
Subject: [PATCH] Remove eol spaces not caught by merge

---
 chapter07/cleanup.xml | 6 +++---
 general.ent           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/chapter07/cleanup.xml b/chapter07/cleanup.xml
index c50c65f06..ad5d96992 100644
--- a/chapter07/cleanup.xml
+++ b/chapter07/cleanup.xml
@@ -127,7 +127,7 @@ umount $LFS/{sys,proc,run,dev}</userinput></screen>
        </para>
     </note>
 
-<screen role="nodump"><userinput>cd $LFS 
+<screen role="nodump"><userinput>cd $LFS
 tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
 
   </sect2>
@@ -154,8 +154,8 @@ tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz .</userinput></screen>
     environment variable is not set for the root user, it will destroy
     your entire host system.  YOU ARE WARNED.</para></warning>
 
-<screen role="nodump"><computeroutput>cd $LFS 
-rm -rf ./* 
+<screen role="nodump"><computeroutput>cd $LFS
+rm -rf ./*
 tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen>
 
     <para>
diff --git a/general.ent b/general.ent
index 0fbdb8017..6cb34ee97 100644
--- a/general.ent
+++ b/general.ent
@@ -21,7 +21,7 @@
 -->
 
 <![ %sysv; [
-<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
                                       Change to x.y for release but not -rc releases -->
 ]]>
 <![ %systemd; [