Conflicts resolved in: gnu/local.mk gnu/packages/cran.scm gnu/packages/gnome.scm gnu/packages/gtk.scm gnu/packages/icu4c.scm gnu/packages/java.scm gnu/packages/machine-learning.scm gnu/packages/tex.scm |
||
---|---|---|
.. | ||
examples | ||
images | ||
accounts.scm | ||
file-systems.scm | ||
hurd.scm | ||
image.scm | ||
install.scm | ||
keyboard.scm | ||
linux-container.scm | ||
linux-initrd.scm | ||
locale.scm | ||
mapped-devices.scm | ||
nss.scm | ||
pam.scm | ||
setuid.scm | ||
shadow.scm | ||
uuid.scm | ||
vm.scm |