I executed "svn merge -r10956:HEAD svn://svn.linuxfromscratch.org/LFS/trunk/BOOK" in workcopy of systemd branch. Summary of conflicts: Text conflicts: 6 Tree conflicts: 2 I have resolved most of the conflicts, but I'm not very sure about them. Should I use r10957 or r10958 to do these ?
lfs_xml.systemd.patch
Description: Binary data
-- http://lists.linuxfromscratch.org/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
