aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchaic <archaic@linuxfromscratch.org>2005-07-01 22:09:36 +0000
committerArchaic <archaic@linuxfromscratch.org>2005-07-01 22:09:36 +0000
commitfd96303fd353bee9f0822e3120b3f57ac073070a (patch)
treeeebbf29831d18d49dee19157f33c7202b31d4376
parent8f1042af1015d48eee06a82fe1123a5eda15f71b (diff)
Sort out some merge problems.
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1/BOOK@6298 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e90d1c12..fa6253a1f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -97,6 +97,8 @@ chapters 1 - 5 (matt).</para></listitem>
the preface section of the book.</para></listitem>
<listitem><para>June 28th, 2005 [archaic]: Switched from mounting /dev on a
+ramfs to a tmpfs.</para></listitem>
+
<listitem><para>June 27th, 2005 [matthew]: Removed mention of test suite
problems from chapter 1 as more comprehensive information is given in
chapter 5 (archaic).</para></listitem>
@@ -105,9 +107,6 @@ chapter 5 (archaic).</para></listitem>
atime failure case, and removed the description of the shm test failure as we
already mount a tmpfs (archaic).</para></listitem>
-<listitem><para>June 27th, 2005 [archaic]: Switched from mounting /dev on a
-ramfs to a tmpfs.</para></listitem>
-
<listitem><para>June 27th, 2005 [archaic]: Filled in text for errata page.
Thanks for the text, Steve!</para></listitem>