chore: Synced file(s) with cloudquery/.github (#387)

Synced local file(s) with [cloudquery/.github](https://github.com/cloudquery/.github). --- This PR was created automatically by the [repo-file-sync-action](https://github.com/BetaHuhn/repo-file-sync-action) workflow run [#2567696727](https://github.com/cloudquery/.github/actions/runs/2567696727)
cloudquery · Jun 27, 2022 · c14f614 · c14f614
1 parent 095f01f
commit c14f614
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
@@ -14,3 +14,6 @@ title = "pull_request_title"
 [merge.automerge_dependencies]
 usernames = ["cq-bot"]
 versions = ["patch"]
+
+[merge]
+notify_on_conflict = false