Skip to content

Nick migel #1

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

Nick migel #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b0ebd8
testing ssh
nickmigel Jan 14, 2020
e76f3df
second test
nickmigel Jan 14, 2020
956ac14
Merge branch 'master' into nick-migel
nickmigel Jan 14, 2020
365d48e
second test
nickmigel Jan 14, 2020
6bc9e5e
testing after merge
nickmigel Jan 14, 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: 11 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ this is a test repo for web28


testing testing 123
<<<<<<< HEAD
nicks test
=======

Oh look! I've made another change.
=======

Oh look! I've made another change.



nicks test
second test
>>>>>>> 956ac142a1ef3c5c3627b94ffb71641f433d4aae