From 7cad2fabc2d155dc1f34dccfb0dc1997c42a870b Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Tue, 18 May 2021 12:17:04 -0700
Subject: [PATCH] Moves kodiak file and updates config

---
 .github/.kodiak.toml | 2 ++
 .kodiak.toml         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .github/.kodiak.toml
 delete mode 100644 .kodiak.toml

diff --git a/.github/.kodiak.toml b/.github/.kodiak.toml
new file mode 100644
index 00000000..36263220
--- /dev/null
+++ b/.github/.kodiak.toml
@@ -0,0 +1,2 @@
+version = 1
+merge.notify_on_conflict = false
diff --git a/.kodiak.toml b/.kodiak.toml
deleted file mode 100644
index d9914dfa..00000000
--- a/.kodiak.toml
+++ /dev/null
@@ -1 +0,0 @@
-version = 1