From b5aadf5fbc9ae8f6df878a51d1e27cc4a90fe303 Mon Sep 17 00:00:00 2001
From: CharlesianMotion <liqianchen123@foxmail.com>
Date: Thu, 17 Sep 2020 19:43:21 +0800
Subject: [PATCH] fucking meassage

---
 merge_conflict.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_conflict.txt b/merge_conflict.txt
index 810f6ed..8477ae8 100644
--- a/merge_conflict.txt
+++ b/merge_conflict.txt
@@ -1,3 +1,3 @@
 This is line 1.
-This is line 2.
+This is line two.
 This is line 3.