From 512f5900c7ca2231bf94f6563ced37c0870a1d74 Mon Sep 17 00:00:00 2001 From: charlmwynn Date: Fri, 15 Aug 2025 10:38:44 -0400 Subject: [PATCH 1/4] Update example.txt --- example.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/example.txt b/example.txt index 1ac9429..a118b56 100644 --- a/example.txt +++ b/example.txt @@ -6,3 +6,4 @@ My Grocery List - Butter - Sugar - Lemons + a;lskdjfiawe;oivanafllvodmz.e;oiwgr;eofjio;k From 7872318d11c41fa7e9b0b3188784309505f2bd2b Mon Sep 17 00:00:00 2001 From: charlmwynn Date: Fri, 15 Aug 2025 10:47:03 -0400 Subject: [PATCH 2/4] added values to the .txt file --- example.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/example.txt b/example.txt index 1ac9429..cc61cb7 100644 --- a/example.txt +++ b/example.txt @@ -6,3 +6,4 @@ My Grocery List - Butter - Sugar - Lemons +blah blah blah \ No newline at end of file From 86026b51903b2cbdc03e8ef79e70a3b39b4ec4a3 Mon Sep 17 00:00:00 2001 From: charlmwynn Date: Fri, 15 Aug 2025 11:09:56 -0400 Subject: [PATCH 3/4] deleted bad changes --- example.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/example.txt b/example.txt index d10af79..32e4011 100644 --- a/example.txt +++ b/example.txt @@ -5,9 +5,3 @@ My Grocery List - Eggs - Butter - Sugar -- Lemons -<<<<<<< HEAD -blah blah blah -======= - a;lskdjfiawe;oivanafllvodmz.e;oiwgr;eofjio;k ->>>>>>> 512f5900c7ca2231bf94f6563ced37c0870a1d74 From 6e50afcf9ff764e94d7abc2d983468c3a5579cf7 Mon Sep 17 00:00:00 2001 From: charlmwynn Date: Fri, 15 Aug 2025 11:12:28 -0400 Subject: [PATCH 4/4] Added greeting to .txt file --- example.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/example.txt b/example.txt index 32e4011..68480b7 100644 --- a/example.txt +++ b/example.txt @@ -5,3 +5,4 @@ My Grocery List - Eggs - Butter - Sugar +Hello from my new branch! \ No newline at end of file