diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-06-09 10:13:45 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-06-09 10:13:45 +0200 |
| commit | d6463e70eeb0ad3d93788a3e0f13e2007be54c50 (patch) | |
| tree | ba89ea9d04379dd923cd074a1d1ed359a0eaabda /tests/files/test-system-merge.conf | |
| parent | 48a08272bfcc0153887b850b4ea82e8fb7d8f1ae (diff) | |
Complete testing of global config files and directories.
Diffstat (limited to 'tests/files/test-system-merge.conf')
| -rw-r--r-- | tests/files/test-system-merge.conf | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/files/test-system-merge.conf b/tests/files/test-system-merge.conf new file mode 100644 index 0000000..978427d --- /dev/null +++ b/tests/files/test-system-merge.conf @@ -0,0 +1,7 @@ + +# Merge in user config +user-config: merge + +key1: system1 +key2: system2 +key3: system3
\ No newline at end of file |