Skip to content

Rb marshall loveland #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Rb marshall loveland #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a08f0e9
add deadline
github-classroom[bot] May 13, 2025
bfdd204
added my-page-marshall-loveland.html
marshallloveland2021 May 13, 2025
45c24f8
added conflict in index.html
marshallloveland2021 May 13, 2025
e726df7
Modified anchor tag
marshallloveland2021 May 13, 2025
7371e84
Merge branch 'main' into marshall-loveland-page-creation
marshallloveland2021 May 13, 2025
4974021
Merge pull request #1 from CSCI313-Spring2024/marshall-loveland-page-…
marshallloveland2021 May 13, 2025
bc17e33
addded function.txt
marshallloveland2021 May 13, 2025
f018ef8
adding new line to function.txt
marshallloveland2021 May 13, 2025
f2bff2d
Merge pull request #4 from CSCI313-Spring2024/rb-test-marshall-loveland
marshallloveland2021 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 4 additions & 0 deletions function.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
“This is a representation of an unfinished function a group member is working
on.

This is a new change from Marshall Loveland.
4 changes: 3 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<title>GitHub Group Tutorial</title>
</head>
<body>
<a href="my-page.html">Your New Page</a>

<a href="my-page-marshall-loveland.html">Your New Page</a>
<a href="my-page-conflict.html">Your New Page</a>
</body>
</html>
12 changes: 12 additions & 0 deletions my-page-marshall-loveland.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Document</title>
</head>
<body>
<h1>This is the page Marshall added</h1>
<a href="index.html">Back</a>
</body>
</html>