From 02edcf9c1a6e1447476f2e3c9af5b4171d9c86f1 Mon Sep 17 00:00:00 2001 From: Atymious Date: Wed, 2 Dec 2020 11:10:30 +0700 Subject: [PATCH 1/5] first commit on new branch --- newtext.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newtext.txt b/newtext.txt index 767a8bda..53e94d92 100644 --- a/newtext.txt +++ b/newtext.txt @@ -1,3 +1,4 @@ ádasdasdasdasd 2222222 -22222121 \ No newline at end of file +22222121 +g27wqd2e82e \ No newline at end of file From 29a839f12ee2294f785ad78a3440aaaaa4cd2df6 Mon Sep 17 00:00:00 2001 From: Atymious Date: Wed, 2 Dec 2020 19:24:27 +0700 Subject: [PATCH 2/5] conflict --- newtext.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newtext.txt b/newtext.txt index 53e94d92..668a944d 100644 --- a/newtext.txt +++ b/newtext.txt @@ -1,4 +1,5 @@ ádasdasdasdasd 2222222 22222121 -g27wqd2e82e \ No newline at end of file +g27wqd2e82e +11111 \ No newline at end of file From 3b8653de48bacbd09a23d4364930a67f79aef3c1 Mon Sep 17 00:00:00 2001 From: Atymious Date: Wed, 2 Dec 2020 19:54:38 +0700 Subject: [PATCH 3/5] file --- myfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 myfile diff --git a/myfile b/myfile new file mode 100644 index 00000000..e69de29b From 865f6bccb8427e70bd2f55d0c74366de1ae6a760 Mon Sep 17 00:00:00 2001 From: Atymious Date: Wed, 2 Dec 2020 20:02:55 +0700 Subject: [PATCH 4/5] a --- New.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 New.txt diff --git a/New.txt b/New.txt new file mode 100644 index 00000000..e69de29b From 7d35987561d778babacf5b807986cda425e47133 Mon Sep 17 00:00:00 2001 From: b1706528 Date: Wed, 2 Dec 2020 20:07:35 +0700 Subject: [PATCH 5/5] a --- New.txt | 0 newtext.txt | 5 ----- 2 files changed, 5 deletions(-) delete mode 100644 New.txt delete mode 100644 newtext.txt diff --git a/New.txt b/New.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/newtext.txt b/newtext.txt deleted file mode 100644 index 668a944d..00000000 --- a/newtext.txt +++ /dev/null @@ -1,5 +0,0 @@ -ádasdasdasdasd -2222222 -22222121 -g27wqd2e82e -11111 \ No newline at end of file