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
@@ -4,12 +4,10 @@ datasources:
    access: proxy
    org_id: 2
    url: url
-    password: password
    user: user
    database: database
    basic_auth: true
    basic_auth_user: basic_auth_user
-    basic_auth_password: basic_auth_password
    with_credentials: true
    is_default: true
    json_data: