Skip to content

Cal resolved conflict #14

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 2 commits into
base: main
Choose a base branch
from
Open

Cal resolved conflict #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d96de8a
hacked
clincoln8 Nov 6, 2020
1b54dfa
resolved conflict
clincoln8 Nov 6, 2020
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
12 changes: 6 additions & 6 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1 style="color:blue;">USC-PiB Github Workshop FA20</h1>
<h4>Sign in below!</h4>

<!-- Name and message templates -->
<p style="background-color:darkgreen;color:white">Christie L says: hello world!</p>
<p style="background-color:darkgreen;color:white">Christie L says: i love my dog</p>
<p>Sophia L says: i love octocat</p>
<p style="background-color:darkblue;color:white">Chau V says: yoink</p>
<p>Daniel L says: coming for part 2!</p>
Expand All @@ -25,10 +25,10 @@ <h4>Sign in below!</h4>

<!-- Add your name and a fun message below following the templates, pick your own background and text colors -->
<p> Daniel G says: hello world!</p>
<p style="background-color:darkred;color:white">Noah D says: Hello? Is this thing on?!?!</p>
<p style="background-color:rgb(76, 145, 76);color:white">Brian says: hello world!</p>
<p style="background-color:darkblue;color:white">Fred Y says: Hello!</p>
<p style="background-color:#8dEbd4;">Faith L says: Hi!</p>
<p style="background-color:pink;color:white">Sharon J says: my favorite marvin gaye song is "let's git it on</p>
<p style="background-color:darkred;color:white">Noah D says: hacked</p>
<p style="background-color:rgb(76, 145, 76);color:white">Brian says: hacked</p>
<p style="background-color:darkblue;color:white">Fred Y says: hacked</p>
<p style="background-color:#8dEbd4;">Faith L says: hacked</p>
<p style="background-color:pink;color:white">Sharon J says: hacked</p>
</body>
</html>