Enable github's merge function

apache · Apr 15, 2021 · db8666c · db8666c
1 parent baa1f69
commit db8666c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -38,5 +38,5 @@ github:
     wiki: true
   enabled_merge_buttons:
     squash:  true
-    merge:   false
-    rebase:  false
+    merge:   true
+    rebase:  false