From 1b77cc0b12684c4b5cc91ad864ed5385ce53f1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=A2=A6?= Date: Mon, 9 Dec 2019 19:41:28 +0800 Subject: [PATCH 1/2] conflict --- Hello.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Hello.md b/Hello.md index 4632e06..04384ea 100644 --- a/Hello.md +++ b/Hello.md @@ -1 +1,4 @@ -123456 \ No newline at end of file +123456 + + +qwert \ No newline at end of file From 3435823772f9a71aa83b4695a2584dfd0bed2f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=A2=A6?= Date: Mon, 9 Dec 2019 19:42:21 +0800 Subject: [PATCH 2/2] conflict2 --- Hello.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hello.md b/Hello.md index 4632e06..a41d377 100644 --- a/Hello.md +++ b/Hello.md @@ -1 +1,2 @@ -123456 \ No newline at end of file +123456 +ASDFG \ No newline at end of file