From 7fc859233f5ebc243f3e4628353ad1317152da9c Mon Sep 17 00:00:00 2001
From: Robert Newson <rnewson@apache.org>
Date: Tue, 6 Oct 2020 17:34:54 +0100
Subject: Enable merge commits to main

---
 .asf.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.asf.yaml b/.asf.yaml
index a3b51fffa..66715b649 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -20,7 +20,7 @@ github:
   enabled_merge_buttons:
     squash: true
     rebase: true
-    merge: false
+    merge: true
 
 notifications:
   commits: commits@couchdb.apache.org
-- 
cgit v1.2.1