From 618e84779de677f6e7e56fd4af470b1702593b54 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 11 Apr 2021 09:44:54 +0000
Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/check_merge_conflict_test.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/check_merge_conflict_test.py b/tests/check_merge_conflict_test.py
index 359b4bcd..ae6149dd 100644
--- a/tests/check_merge_conflict_test.py
+++ b/tests/check_merge_conflict_test.py
@@ -132,11 +132,11 @@ def test_does_not_care_when_not_in_a_merge(tmpdir):
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n======= \n')
     assert main([str(f.realpath())]) == 0
-    
+
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n|||||||\n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 0
-    
+
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n||||||| \n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 0
@@ -150,11 +150,11 @@ def test_care_when_assumed_merge(tmpdir):
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n======= \n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 1
-    
+
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n|||||||\n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 1
-    
+
     f = tmpdir.join('README.md')
     f.write_binary(b'problem\n||||||| \n')
     assert main([str(f.realpath()), '--assume-in-merge']) == 1