From 4440a1ef90a18b1dc0d18b89b9ea8b78d33931eb Mon Sep 17 00:00:00 2001 From: alemnor <82982830+alemnor@users.noreply.github.com> Date: Thu, 12 Mar 2026 17:39:42 -0600 Subject: [PATCH 1/8] Add filler text to myfile.txt --- _slides/myfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 _slides/myfile.txt diff --git a/_slides/myfile.txt b/_slides/myfile.txt new file mode 100644 index 0000000..7f2ced9 --- /dev/null +++ b/_slides/myfile.txt @@ -0,0 +1 @@ +Just some filler text From 2576c64056407874dcdb01a1bb40eabc7d727a5a Mon Sep 17 00:00:00 2001 From: Kerry Loynd Date: Fri, 13 Mar 2026 08:44:21 -0600 Subject: [PATCH 2/8] INC001 - adding my md --- _slides/05-kerryloynd.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 _slides/05-kerryloynd.md diff --git a/_slides/05-kerryloynd.md b/_slides/05-kerryloynd.md new file mode 100644 index 0000000..0b77b79 --- /dev/null +++ b/_slides/05-kerryloynd.md @@ -0,0 +1 @@ +https://github.com/alemnor/caption-this.git \ No newline at end of file From 0f499b3ea9b898b1e77b4970f40a2f897124ba3f Mon Sep 17 00:00:00 2001 From: "Majumder, Arvind" Date: Fri, 13 Mar 2026 10:44:30 -0400 Subject: [PATCH 3/8] Updating caption --- _slides/05-prainex.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 _slides/05-prainex.md diff --git a/_slides/05-prainex.md b/_slides/05-prainex.md new file mode 100644 index 0000000..e69de29 From 0efd26f9e2bbe3344d4c6ac9b79e7f851949b332 Mon Sep 17 00:00:00 2001 From: alemnor <82982830+alemnor@users.noreply.github.com> Date: Fri, 13 Mar 2026 08:47:17 -0600 Subject: [PATCH 4/8] Create addedcode.txt --- addedcode.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 addedcode.txt diff --git a/addedcode.txt b/addedcode.txt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/addedcode.txt @@ -0,0 +1 @@ + From f2afc93ed0ae7e8093587699eb88d4ee90118c98 Mon Sep 17 00:00:00 2001 From: "Majumder, Arvind" Date: Fri, 13 Mar 2026 11:20:53 -0400 Subject: [PATCH 5/8] just fixing all the imports and exports --- _slides/05-prainex.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_slides/05-prainex.md b/_slides/05-prainex.md index e69de29..25863f3 100644 --- a/_slides/05-prainex.md +++ b/_slides/05-prainex.md @@ -0,0 +1 @@ +https://github.com/alemnor/caption-this.git From 7d66e240aafe53d32ac442df806c71d762379a90 Mon Sep 17 00:00:00 2001 From: Kerry Loynd Date: Fri, 13 Mar 2026 10:41:19 -0600 Subject: [PATCH 6/8] Stage 1 conflict --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index dca3839..6cb4dd8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ _site/ .jekyll-metadata .bundle vendor/ +/.vs/caption-this.slnx/FileContentIndex/c9ee34a2-8733-4d8c-b300-8811cb62671d.vsidx +/.vs/caption-this.slnx/FileContentIndex +/.vs/ProjectSettings.json +/.vs/slnx.sqlite +/.vs/slnx.sqlite-journal From 4ff87b56e08bc387817c88cc3f715c59428d105e Mon Sep 17 00:00:00 2001 From: Kerry Loynd Date: Fri, 13 Mar 2026 10:41:38 -0600 Subject: [PATCH 7/8] Commit --- _slides/myfile.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_slides/myfile.txt b/_slides/myfile.txt index 7f2ced9..fef21e9 100644 --- a/_slides/myfile.txt +++ b/_slides/myfile.txt @@ -1 +1,2 @@ -Just some filler text +1. Just some filler text + From 62732a0d79855470ac1fd69acc130fa95c81db59 Mon Sep 17 00:00:00 2001 From: emmanuelliny <163685983+emmanuelliny@users.noreply.github.com> Date: Fri, 13 Mar 2026 12:43:47 -0400 Subject: [PATCH 8/8] Update filler text in myfile.txt --- _slides/myfile.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_slides/myfile.txt b/_slides/myfile.txt index 7f2ced9..1bec144 100644 --- a/_slides/myfile.txt +++ b/_slides/myfile.txt @@ -1 +1 @@ -Just some filler text +Just some filler text - more filler text