From 677dee1a04058aefe8c7689f88da52afe3b4b4bb Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Fri, 15 Aug 2014 08:41:43 +0200 Subject: Move to non-recursive Makefile for building bins and libs Still use recursive for documentation and translation. --- p11-kit/tests/files/test-system-merge.conf | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 p11-kit/tests/files/test-system-merge.conf (limited to 'p11-kit/tests/files/test-system-merge.conf') 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 -- cgit v1.1