fixing merge conflict

2023-10-01 23:39:53 +02:00
parent c6da80c598
commit 301a0ba5ec
2 changed files with 2 additions and 14 deletions
--- a/veilid-server/src/settings.rs
+++ b/veilid-server/src/settings.rs
@@ -49,7 +49,7 @@ core:
        disable: []
    protected_store:
        allow_insecure_fallback: true
-        always_use_insecure_storage: false
+        always_use_insecure_storage: true
        directory: '%DIRECTORY%'
        delete: false
        device_encryption_key_password: '%DEVICE_ENCRYPTION_KEY_PASSWORD%'