Skip to content

merge conflict from charlie #2

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
charliecjung wants to merge 1 commit into
base: master
Choose a base branch
from
Open

merge conflict from charlie #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h4 class="card-title">Similarities</h4>
<h5 class="card-subtitle">Find three non-physical similarities about your team!</h5>
<p class="card-text">1. We all go to U of I. </p>
<p class="card-text">2. We're all from different locations. </p>
<p class="card-text">3. We're all learning Git. </p>
<p class="card-text">3. We're all learning Git.bruh this is a late merge conflict. </p>
</div>
</div>
</div>
Expand Down Expand Up @@ -90,4 +90,4 @@ <h5 class="card-subtitle">Freshman // CS+Ling</h5>
</div>
</main>
</div>
</html>
</html>