d227260d2f
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. |
||
|---|---|---|
| .. | ||
| images | ||
| contributing.texi | ||
| emacs.texi | ||
| environment-gdb.scm | ||
| fdl-1.3.texi | ||
| guix.texi | ||
| htmlxref.cnf | ||
| local.mk | ||
| package-hello.scm | ||