resolve conflict

risingwavelabs · Feb 5, 2024 · 72d7787 · 72d7787
2 parents b60fe1a + c1a1286
commit 72d7787
Show file tree

Hide file tree

Showing 367 changed files with 5,435 additions and 1,999 deletions.
diff --git a/.github/workflows/cherry-pick-to-release-branch.yml b/.github/workflows/cherry-pick-to-release-branch.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
     branches:
       - main
-    types: ["closed"]
+    types: ["closed", "labeled"]
 
 jobs:
   release_pull_request_1_7: