Ludovic Courtès 716753cb97 tests: base: Correct invalid merge. ... Fixes a regression introduced by merge commit 7575655212. * gnu/tests/base.scm (run-basic-test)[test]: Fix list of 'use-modules' and 'test-begin' call.		2016-07-30 15:47:28 +02:00
..
build
packages	Merge branch 'master' into core-updates	2016-07-29 18:29:58 -04:00
services	services: Export *-service-type and *-configuration.	2016-07-21 18:53:27 +02:00
system	Merge remote-tracking branch 'origin/master' into core-updates	2016-07-28 11:08:55 +02:00
tests	tests: base: Correct invalid merge.	2016-07-30 15:47:28 +02:00
artwork.scm
local.mk	Merge branch 'master' into core-updates	2016-07-29 18:29:58 -04:00
packages.scm	packages: Add 'hidden-package'.	2016-07-28 18:50:43 +02:00
services.scm
system.scm	system: Source /etc/environment before $HOME/.guix-profile/etc/profile.	2016-07-27 23:08:20 +02:00
tests.scm