From 798a1c4216f543b6fbecaefca6c762949e323f13 Mon Sep 17 00:00:00 2001 From: Yuriy Magus <114507764+theMagusDev@users.noreply.github.com> Date: Thu, 5 Oct 2023 18:43:03 +0300 Subject: [PATCH 1/2] Student info changed --- student_data.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/student_data.txt b/student_data.txt index 1d43258..50e64bf 100644 --- a/student_data.txt +++ b/student_data.txt @@ -1,2 +1,2 @@ -Yuriy Magus, CST-6 -Programming techs \ No newline at end of file +Yuriy Magus, CST-369 +Algorithms and data structures \ No newline at end of file From 0b113ef6b6d87e1adf18cff9513dd4152dc83fb0 Mon Sep 17 00:00:00 2001 From: Yuriy Magus <114507764+theMagusDev@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:27:24 +0300 Subject: [PATCH 2/2] Text file #1 and #2 for branch1 and bob_work patch created --- bob_work.patch | 71 ++++++++++++++++++++++++++++++++++++++++++++ branch1TextFile1.txt | 1 + branch1TextFile2.txt | 1 + 3 files changed, 73 insertions(+) create mode 100644 bob_work.patch create mode 100644 branch1TextFile1.txt create mode 100644 branch1TextFile2.txt diff --git a/bob_work.patch b/bob_work.patch new file mode 100644 index 0000000..3308c7e --- /dev/null +++ b/bob_work.patch @@ -0,0 +1,71 @@ +From e3f1bf2669034c58756329c8f974dfd4459093b0 Mon Sep 17 00:00:00 2001 +From: Yuriy Magus <114507764+theMagusDev@users.noreply.github.com> +Date: Sat, 7 Oct 2023 09:26:25 +0300 +Subject: [PATCH 1/3] Added one more book to the book.txt file + +--- + book.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/book.txt b/book.txt +index c78e699..c9c2431 100644 +--- a/book.txt ++++ b/book.txt +@@ -1 +1,2 @@ +-Captain's daughter +\ No newline at end of file ++Captain's daughter ++Evgenii Onegin +\ No newline at end of file +-- +2.41.0.windows.3 + + +From ad02731deecfc0c9a60a552034e229bf8f138e31 Mon Sep 17 00:00:00 2001 +From: Yuriy Magus <114507764+theMagusDev@users.noreply.github.com> +Date: Sat, 7 Oct 2023 09:28:15 +0300 +Subject: [PATCH 2/3] Added 2 new greetings to greeting.txt file + +--- + greeting.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/greeting.txt b/greeting.txt +index 5ab2f8a..9697df4 100644 +--- a/greeting.txt ++++ b/greeting.txt +@@ -1 +1,3 @@ +-Hello +\ No newline at end of file ++Hello ++Hey ++Hi +\ No newline at end of file +-- +2.41.0.windows.3 + + +From e05a577daf22911ef8dac11fa8f9196c6241a985 Mon Sep 17 00:00:00 2001 +From: Yuriy Magus <114507764+theMagusDev@users.noreply.github.com> +Date: Sat, 7 Oct 2023 09:29:43 +0300 +Subject: [PATCH 3/3] Added a dinner to schedule.txt + +--- + schedule.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/schedule.txt b/schedule.txt +index e5df0f8..60db76a 100644 +--- a/schedule.txt ++++ b/schedule.txt +@@ -1,6 +1,7 @@ + Tuesday + Discrete mathematics + Programming techs ++A dinner + Programming techs + Discrete mathematics + Linear algebra +-- +2.41.0.windows.3 + diff --git a/branch1TextFile1.txt b/branch1TextFile1.txt new file mode 100644 index 0000000..bd41cba --- /dev/null +++ b/branch1TextFile1.txt @@ -0,0 +1 @@ +12345 \ No newline at end of file diff --git a/branch1TextFile2.txt b/branch1TextFile2.txt new file mode 100644 index 0000000..a7937c2 --- /dev/null +++ b/branch1TextFile2.txt @@ -0,0 +1 @@ +234321544325 \ No newline at end of file