Skip to content

fixed merge conflict and added name to participants #71

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

fixed merge conflict and added name to participants #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
166311a
modified file.txt
mwittie Feb 12, 2020
104e418
changed file.txt
mwittie Feb 12, 2020
bfb1af0
added my name to participants
conner-whitfield Feb 22, 2020
a03a078
Merge branch 'branch1'
conner-whitfield Feb 22, 2020
95e7dac
fixed merge conflict on file.txt
conner-whitfield Feb 22, 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
1 change: 1 addition & 0 deletions file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2+2=4
1 change: 1 addition & 0 deletions participants.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Add your name to the list below:
Mike Wittie
Conner Whitfield