sjgriffiths/rsd-classwork-2019

How to solve conflicts - SOLUTION

Closed this issue · 1 comments

sjgriffiths commented 
vim README.md
git add README.md
git commit

conflict1

conflict2

sjgriffiths commented

Answers UCL-RITS/rsd-classwork-2019#3