From aa007130495c5db833bb73af411df1361563b392 Mon Sep 17 00:00:00 2001
From: Berkus Decker <berkus+github@metta.systems>
Date: Sat, 11 Jun 2022 00:11:58 +0300
Subject: [PATCH] =?UTF-8?q?chore:=20=E2=99=BB=EF=B8=8F=20Ignore=20non-conv?=
 =?UTF-8?q?entional=20merge=20commits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cog.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cog.toml b/cog.toml
index 20a6360..61fcc43 100644
--- a/cog.toml
+++ b/cog.toml
@@ -1,2 +1,4 @@
+ignore_merge_commits = true
+
 [commit_types]
 wip = { changelog_title = "Work in progress (should not be in changelog!)" }