Merge branch 'master' into data-table-docs-update

carbon-design-system · Jul 9, 2020 · eda1f53 · eda1f53
2 parents 632cbb4 + f33deee
commit eda1f53
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -4,3 +4,6 @@ version = 1
 
 # Kodiak will only act on PRs that have this label.
 automerge_label = "status: ready to merge 🎉"
+
+# Choose merge method for Kodiak to use.
+method = "squash"