From 0e65affc80e044d4a4b554d9e6acb57eaf73a23e Mon Sep 17 00:00:00 2001 From: Shadman268 <66688205+Shadman268@users.noreply.github.com> Date: Tue, 30 Nov 2021 12:19:26 +0600 Subject: [PATCH 1/2] Create conflict.txt --- conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..ce01362 --- /dev/null +++ b/conflict.txt @@ -0,0 +1 @@ +hello From 3b42029cf903a62ec9281e93bda9a30810e70825 Mon Sep 17 00:00:00 2001 From: shadman Date: Tue, 30 Nov 2021 12:19:44 +0600 Subject: [PATCH 2/2] added --- conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..71d127b --- /dev/null +++ b/conflict.txt @@ -0,0 +1 @@ +i am main \ No newline at end of file