From dfdba3c02089e99ad0b9f4754bdde97dfe5bf1a3 Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jpeabody@axway.com>
Date: Sun, 21 Nov 2021 13:56:30 +0000
Subject: [PATCH] ci: allow merge type

---
 git-conventional-commits.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/git-conventional-commits.json b/git-conventional-commits.json
index 3a98fec..1ef7b7a 100644
--- a/git-conventional-commits.json
+++ b/git-conventional-commits.json
@@ -8,7 +8,8 @@
       "style",
       "refactor",
       "perf",
-      "test"
+      "test",
+      "merge"
     ],
     "commitScopes": [],
     "releaseTagGlobPattern": "v[0-9].*",