aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2006-07-13 03:19:50 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2006-07-13 03:19:50 +0000
commitb9fb33e57b25f18779884ac4447064d7656134b6 (patch)
tree32c0e6f2d71b025c636ec7a07173234675db6a57
parent508445aed9ced4a1535e446705d43ce71463208b (diff)
Always validate *before* committing. Always...
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7665 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2eae948d6..a5eb9132f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -55,7 +55,6 @@
involving Udev. Closes ticket #1818.</para>
</listitem>
<listitem>
->>>>>>> .r7663
<para>[bdubbs] - Updated udev-config and bootscripts download
location.</para>
</listitem>