githubschool / Sept-5

Let's learn about Git and GitHub
https://githubschool.github.io/Sept-5/
MIT License
1 stars 0 forks source link

Make a conflict on purpose #7

Open githubteacher opened 5 years ago

githubteacher commented 5 years ago

Change the same file!