Resolved conflicts: * gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master, "#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was used. The latter won the conflict. * gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict in 'install-shell-completion. |
||
---|---|---|
.. | ||
build | ||
packages | ||
services | ||
system | ||
tests | ||
artwork.scm | ||
local.mk | ||
packages.scm | ||
services.scm | ||
system.scm | ||
tests.scm |