Changeset d6c4063 for BOOK/final-system/mips-chapter.xml

Timestamp:

Jan 4, 2014, 10:03:05 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

3a94cd1

Parents:

6b4dba7

Message:

Fix more render errors

File:

• BOOK/final-system/mips-chapter.xml (modified) (2 diffs)

BOOK/final-system/mips-chapter.xml

@@ -61 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
-<<<<<<< HEAD
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/make.xml"/>
@@ -72 +70 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>