[carbondata] branch master updated: Enable github's merge function

[chenliang613]

This is an automated email from the ASF dual-hosted git repository.

chenliang613 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new db8666c  Enable github's merge function
     new 6be1691  Enable github's merge function This closes #4119
db8666c is described below

commit db8666c09081118693bb8c102f6265d9e5d61081
Author: Liang Chen <chenliang...@apache.org>
AuthorDate: Thu Apr 15 16:09:51 2021 +0800

    Enable github's merge function
    
    Enable github's merge function
---
 .asf.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 399afd8..922c20d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -38,5 +38,5 @@ github:
     wiki: true
   enabled_merge_buttons:
     squash:  true
-    merge:   false
-    rebase:  false
\ No newline at end of file
+    merge:   true
+    rebase:  false