From 6c6f95050bc1a61e7d56e892d72d4ef32baf5dc0 Mon Sep 17 00:00:00 2001 From: Peter Greshnov Date: Tue, 29 Nov 2022 18:09:45 +0600 Subject: [PATCH 1/4] Adding course-notes.md file --- course-notes.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 course-notes.md diff --git a/course-notes.md b/course-notes.md new file mode 100644 index 00000000..6f7820bf --- /dev/null +++ b/course-notes.md @@ -0,0 +1 @@ +# Udemy GitHub Actions course notes \ No newline at end of file From c4e08c8c1b5a1c6b99929090cf05d76541357d3d Mon Sep 17 00:00:00 2001 From: Peter Greshnov Date: Tue, 29 Nov 2022 18:17:19 +0600 Subject: [PATCH 2/4] Test change 2 --- course-notes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/course-notes.md b/course-notes.md index 6f7820bf..39c22b8a 100644 --- a/course-notes.md +++ b/course-notes.md @@ -1 +1,3 @@ -# Udemy GitHub Actions course notes \ No newline at end of file +# Udemy GitHub Actions course notes + +Test change 1 \ No newline at end of file From 640a866d9eb6f5100b18fc44c7c4ded4cf8206fd Mon Sep 17 00:00:00 2001 From: Peter Greshnov Date: Tue, 29 Nov 2022 18:27:26 +0600 Subject: [PATCH 3/4] Additional edit --- course-notes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/course-notes.md b/course-notes.md index 6f7820bf..921ffb48 100644 --- a/course-notes.md +++ b/course-notes.md @@ -1 +1,3 @@ -# Udemy GitHub Actions course notes \ No newline at end of file +# Udemy GitHub Actions course notes + +Test edit 2 \ No newline at end of file From 0b10e7272b56b8b4da265d2e6e4950d7f90b3905 Mon Sep 17 00:00:00 2001 From: Peter Greshnov Date: Tue, 29 Nov 2022 18:38:11 +0600 Subject: [PATCH 4/4] Additional conflict resolved --- course-notes.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/course-notes.md b/course-notes.md index cc73d128..430e3525 100644 --- a/course-notes.md +++ b/course-notes.md @@ -1,7 +1,4 @@ # Udemy GitHub Actions course notes -<<<<<<< HEAD Test change 1 -======= -Test edit 2 ->>>>>>> 640a866d9eb6f5100b18fc44c7c4ded4cf8206fd +Test edit 2 \ No newline at end of file