From 8206f2594f75c6f7d8308d17db095f6bcb597736 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 21 Oct 2024 21:28:23 +0000
Subject: [PATCH] chore(pre-commit): autofix run

---
 tests/conftest.py           | 2 ++
 tests/messages/merge_commit | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 24fc8b2..bab7488 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -43,10 +43,12 @@ def conventional_gbk_commit_path():
 def fixup_commit_path():
     return get_message_path("fixup_commit")
 
+
 @pytest.fixture
 def merge_commit_path():
     return get_message_path("merge_commit")
 
+
 @pytest.fixture
 def conventional_commit_bad_multi_line_path():
     return get_message_path("conventional_commit_bad_multi_line")
diff --git a/tests/messages/merge_commit b/tests/messages/merge_commit
index 6f038da..3cfe63b 100644
--- a/tests/messages/merge_commit
+++ b/tests/messages/merge_commit
@@ -1 +1 @@
-Merge branch '2.x.x' into '1.x.x'
\ No newline at end of file
+Merge branch '2.x.x' into '1.x.x'