resolve conflicts (#50184)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2022-06-03 18:03:45 +02:00
parent fc4018048e
commit d4fde160a1
33 changed files with 274 additions and 450 deletions
@@ -37,5 +37,6 @@ datasources:
    # optionally
    basicAuth: true
    basicAuthUser: my_user
-    basicAuthPassword: test_password
+    secureJsonData:
+      basicAuthPassword: test_password
 ```