From 56605d9bb3f23d16d7c57f7583f49eee3caff87e Mon Sep 17 00:00:00 2001 From: eldong Date: Thu, 6 Aug 2026 09:09:16 -0500 Subject: [PATCH 1/5] Update title in README for merge conflict branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 112b874d..58ce25df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GitHub Training Manual +# GitHub Training Manual - Change in Merge Conflict Branch [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) From 91776f469856e0e9de90e64643286830b4ad29d2 Mon Sep 17 00:00:00 2001 From: eldong Date: Thu, 6 Aug 2026 09:09:38 -0500 Subject: [PATCH 2/5] Update title of GitHub Training Manual --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 112b874d..08838618 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GitHub Training Manual +# GitHub Training Manual- Change in Main [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) From 37ea7de2b25b57a721246e02fc48c5fa99673317 Mon Sep 17 00:00:00 2001 From: eldong Date: Mon, 10 Aug 2026 14:11:50 -0500 Subject: [PATCH 3/5] Simplify README.md headers Removed redundant headers from README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 92765c02..112b874d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# GitHub Training Manual - Change in Merge Conflict Branch -# GitHub Training Manual- Change in Main +# GitHub Training Manual [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) From 764e41f68b3c9b00a76672e3859a8ec7cc9d2483 Mon Sep 17 00:00:00 2001 From: Eldon Gormsen Date: Mon, 28 Sep 2026 09:58:16 -0500 Subject: [PATCH 4/5] Update README.md title and add a new line --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 112b874d..8c05c7b7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# GitHub Training Manual +# GitHub Training Manual - Update from local + +# Add a line new [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](CODE_OF_CONDUCT.md) From e5a0b0dd86f020efff1bdf30f97f648debd5b226 Mon Sep 17 00:00:00 2001 From: Eldon Gormsen Date: Mon, 28 Sep 2026 09:59:35 -0500 Subject: [PATCH 5/5] Add subtitle to slide template and create new text file --- new text file.txt | 1 + slide_template.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 new text file.txt diff --git a/new text file.txt b/new text file.txt new file mode 100644 index 00000000..55f2f902 --- /dev/null +++ b/new text file.txt @@ -0,0 +1 @@ +new text file \ No newline at end of file diff --git a/slide_template.md b/slide_template.md index 303f8d7f..dc623d1f 100644 --- a/slide_template.md +++ b/slide_template.md @@ -1,6 +1,7 @@ --- layout: slide title: "Welcome to our slide deck!" +subtitle: "Hi Subtitle" --- Caption here