From 98e0b57c166ba52267354a8c2889368db271e92e Mon Sep 17 00:00:00 2001 From: Bud Marrical Date: Wed, 8 Jul 2026 12:09:24 -0500 Subject: [PATCH 1/5] Added something --- something.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 something.md diff --git a/something.md b/something.md new file mode 100644 index 0000000..1bdb781 --- /dev/null +++ b/something.md @@ -0,0 +1,2 @@ +New changes +Second sert of new changes \ No newline at end of file From 32cd2b1ad186df7ec64803891d935540274deb69 Mon Sep 17 00:00:00 2001 From: Bud Marrical Date: Wed, 8 Jul 2026 12:11:33 -0500 Subject: [PATCH 2/5] corrected typo --- something.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/something.md b/something.md index 1bdb781..c32fe98 100644 --- a/something.md +++ b/something.md @@ -1,2 +1,2 @@ New changes -Second sert of new changes \ No newline at end of file +Second set of new changes \ No newline at end of file From d04a61f023b9caeb329b0d0c8930dc6df429999b Mon Sep 17 00:00:00 2001 From: Bud Marrical Date: Wed, 8 Jul 2026 12:12:15 -0500 Subject: [PATCH 3/5] more changes to cause conflict --- something.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/something.md b/something.md index 1bdb781..1a8f4bb 100644 --- a/something.md +++ b/something.md @@ -1,2 +1,3 @@ New changes -Second sert of new changes \ No newline at end of file +Second sert of new changes +Third set of changes \ No newline at end of file From bf6f5bbd5e7b1b6096a910f2023747a7606394bb Mon Sep 17 00:00:00 2001 From: Bud Marrical Date: Wed, 8 Jul 2026 12:24:11 -0500 Subject: [PATCH 4/5] updated gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 3486c50..60f8181 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,6 @@ FakesAssemblies/ **/*.Server/GeneratedArtifacts **/*.Server/ModelManifest.xml _Pvt_Extensions + +# Environment files +.env \ No newline at end of file From 11f29801bd43b6ce611e9dda017055e19bff56a8 Mon Sep 17 00:00:00 2001 From: Bud Marrical Date: Wed, 8 Jul 2026 12:25:29 -0500 Subject: [PATCH 5/5] Made changes on github --- something.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/something.md b/something.md index 7fa3e1a..31d4f32 100644 --- a/something.md +++ b/something.md @@ -1,3 +1,5 @@ New changes Second set of new changes Third set of changes + +Hello from github!