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. diff --git a/function.txt b/function.txt new file mode 100644 index 0000000..90ef941 --- /dev/null +++ b/function.txt @@ -0,0 +1,15 @@ +This is a representation of an unfinished function a group member is working on. +This is the changes made to this branch while you were working on rb-test + +"This is a representation of an unfinished function a group member is working on." +"This is the changes made to this branch while you were working on rb-test" + +"This is a new change from patrick wirries" + +This is a representation of an unfinished function a group member is working on. +This is a new change from Davis Ginsburg + +This is a representation of an unfinished function a group member is working on. +This is a new change from Nicholas Hoedl. + +This is the changes made to this branch while you were working on rb-test” \ No newline at end of file diff --git a/important.txt b/important.txt new file mode 100644 index 0000000..e69de29 diff --git a/index.html b/index.html index ac4fd1a..fe7972f 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,14 @@ GitHub Group Tutorial - Your New Page + + Patrick's New Page + + + Davis's New Page + + Your New Page (Conflict) + + diff --git a/my-page-davis-ginsburg.html b/my-page-davis-ginsburg.html new file mode 100644 index 0000000..a6a4aca --- /dev/null +++ b/my-page-davis-ginsburg.html @@ -0,0 +1,13 @@ + + + + + + Document + + +

This is the page Davis added

+ Back + + +g \ No newline at end of file diff --git a/my-page-patrick-wirries.html b/my-page-patrick-wirries.html new file mode 100644 index 0000000..0651cdc --- /dev/null +++ b/my-page-patrick-wirries.html @@ -0,0 +1,12 @@ + + + + + + Document + + +

This is the page Patrick added

+ Back + + \ No newline at end of file