Created nicholas-tomja.txt and populated the first line - Githubissues

githubschool / Nov-6

Let's learn about Git and GitHub

https://githubschool.github.io/Nov-6/

MIT License

2 stars 1 forks source link

Created nicholas-tomja.txt and populated the first line #37

Closed nicholas-patten closed 6 years ago

nicholas-patten commented 6 years ago

This file should cause a merge conflict