summaryrefslogtreecommitdiff
path: root/tests/files/system-pkcs11.conf
diff options
context:
space:
mode:
authorStef Walter <stefw@gnome.org>2012-04-02 15:36:34 +0200
committerStef Walter <stefw@gnome.org>2012-04-02 16:07:20 +0200
commit85f9d306832964f6d6412392f335e1fa3f3efd8b (patch)
tree1e9ef89d7cec004b01557d531fa43e80fe06a5b6 /tests/files/system-pkcs11.conf
parentd4c5661a695b5fc4a0126a4583e30ef70aea54ac (diff)
Add tests for enable-in and disable-in
Diffstat (limited to 'tests/files/system-pkcs11.conf')
-rw-r--r--tests/files/system-pkcs11.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/files/system-pkcs11.conf b/tests/files/system-pkcs11.conf
new file mode 100644
index 0000000..20741e7
--- /dev/null
+++ b/tests/files/system-pkcs11.conf
@@ -0,0 +1,3 @@
+
+# Merge in user config
+user-config: merge \ No newline at end of file