diff options
| author | Stef Walter <stef@thewalter.net> | 2014-08-15 08:41:43 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2014-08-15 10:43:04 +0200 |
| commit | 677dee1a04058aefe8c7689f88da52afe3b4b4bb (patch) | |
| tree | 570bf0fb53fa659954f03e146696969ab97abe3a /p11-kit/tests/files/test-system-merge.conf | |
| parent | 2a35a67923c26cd38839197aee51c274e5c2550e (diff) | |
Move to non-recursive Makefile for building bins and libs
Still use recursive for documentation and translation.
Diffstat (limited to 'p11-kit/tests/files/test-system-merge.conf')
| -rw-r--r-- | p11-kit/tests/files/test-system-merge.conf | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/p11-kit/tests/files/test-system-merge.conf b/p11-kit/tests/files/test-system-merge.conf deleted file mode 100644 index 978427d..0000000 --- a/p11-kit/tests/files/test-system-merge.conf +++ /dev/null @@ -1,7 +0,0 @@ - -# Merge in user config -user-config: merge - -key1: system1 -key2: system2 -key3: system3
\ No newline at end of file |