From a08f0e9472210a27de132a7a73a5ddae663fc79b Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 01:09:14 +0000 Subject: [PATCH 1/6] add deadline --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1956698..e59182e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/0uiMevno) # git-group-tutorial The purpose of this tutorial is to learn and apply git commands needed to collaborate on a team project. From bfdd2040f3e75dab98d4c2f566b8603413db5510 Mon Sep 17 00:00:00 2001 From: Marshall Loveland Date: Mon, 12 May 2025 21:15:34 -0500 Subject: [PATCH 2/6] added my-page-marshall-loveland.html --- my-page-marshall-loveland.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 my-page-marshall-loveland.html diff --git a/my-page-marshall-loveland.html b/my-page-marshall-loveland.html new file mode 100644 index 0000000..23b0aa7 --- /dev/null +++ b/my-page-marshall-loveland.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Marshall added

+ Back + + From 45c24f8777c8103855cff813c0ecc125df3d441f Mon Sep 17 00:00:00 2001 From: Marshall Loveland Date: Mon, 12 May 2025 21:21:45 -0500 Subject: [PATCH 3/6] added conflict in index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..eb9e53c 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From e726df77c1c5f5ae795e0352b9d14db80729e3d8 Mon Sep 17 00:00:00 2001 From: Marshall Loveland Date: Mon, 12 May 2025 21:30:49 -0500 Subject: [PATCH 4/6] Modified anchor tag --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index ac4fd1a..b8ea31a 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,6 @@ GitHub Group Tutorial - Your New Page + Your New Page From bc17e33b167734343e8bfeef430e46c8b6ac2003 Mon Sep 17 00:00:00 2001 From: Marshall Loveland Date: Mon, 12 May 2025 21:45:22 -0500 Subject: [PATCH 5/6] addded function.txt --- function.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 function.txt diff --git a/function.txt b/function.txt new file mode 100644 index 0000000..bd5f69c --- /dev/null +++ b/function.txt @@ -0,0 +1,2 @@ +“This is a representation of an unfinished function a group member is working +on. \ No newline at end of file From f018ef8d2a4913fd5d328153882c2ca1447e0bd8 Mon Sep 17 00:00:00 2001 From: Marshall Loveland Date: Mon, 12 May 2025 21:52:10 -0500 Subject: [PATCH 6/6] adding new line to function.txt --- function.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/function.txt b/function.txt index bd5f69c..4d5e14a 100644 --- a/function.txt +++ b/function.txt @@ -1,2 +1,4 @@ “This is a representation of an unfinished function a group member is working -on. \ No newline at end of file +on. + +This is a new change from Marshall Loveland. \ No newline at end of file