From 4a1a239b72e3d060c21b124b6e57a0c9fb1cc791 Mon Sep 17 00:00:00 2001
From: Wade Barnes <wade@neoterictech.ca>
Date: Thu, 20 May 2021 13:12:35 -0700
Subject: [PATCH] Allow merge commits (#2391)

Signed-off-by: Wade Barnes <wade@neoterictech.ca>
---
 .github/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index 60dd723eca..c1f82532e4 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -14,5 +14,5 @@ repository:
   archived: false
   private: false
   allow_squash_merge: true
-  allow_merge_commit: false
+  allow_merge_commit: true
   allow_rebase_merge: true