From ddee644106cc0adb0447e7de19383bea4ecebf81 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2023 16:43:48 +0530 Subject: [PATCH 1/3] added conclusion --- conclusion.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conclusion.txt diff --git a/conclusion.txt b/conclusion.txt new file mode 100644 index 0000000..febd87e --- /dev/null +++ b/conclusion.txt @@ -0,0 +1 @@ +This is the conclusion of the project. \ No newline at end of file From 1ea8b72abc1524382b790258caed3861be8ba3e8 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2023 16:45:24 +0530 Subject: [PATCH 2/3] added conflict --- conclusion.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conclusion.txt b/conclusion.txt index febd87e..873f670 100644 --- a/conclusion.txt +++ b/conclusion.txt @@ -1 +1,2 @@ -This is the conclusion of the project. \ No newline at end of file +This is the conclusion of the project. +hello world \ No newline at end of file From 33941cce86e72cf9e0f0bf28031ab2ef3773b3e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 7 Apr 2023 17:35:31 +0530 Subject: [PATCH 3/3] added --- conclusion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conclusion.txt b/conclusion.txt index 873f670..184d157 100644 --- a/conclusion.txt +++ b/conclusion.txt @@ -1,2 +1,2 @@ This is the conclusion of the project. -hello world \ No newline at end of file +hello world asdasdasdasdasdasda \ No newline at end of file