resolve conflicts

alma · Oct 11, 2023 · 498db60 · 498db60
2 parents 3db5153 + c027733
commit 498db60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
     - name: Checkout current repo in CI
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,4 +58,4 @@ repos:
     hooks:
       - id: check-branch-name
         args:
-          - "-r^((chore|ci|dependabot|devx|docs|feature|fix|hotfix|hotfix-backport|infra|other|perf|refactor|security|test)\/.+|(snyk)-.+|main|HEAD)$$"
+          - "-r^((chore|ci|dependabot|devx|docs|feature|fix|hotfix|hotfix-backport|infra|other|perf|refactor|security|test)\/.+|(snyk)-.+|main|HEAD|develop)$$"
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,6 +6,10 @@ v4.5.0
 * Feat: add Deferred Capture feature.
 * Chore: add pre-commit tool.
 
+v4.4.0
+------
+* Feat: In Page checkout
+
 v4.3.1
 ------
 * Feat: add Pay Now with credit card with Alma.