File:Merge2.png: Difference between revisions

Maintenance script uploaded File:Merge2.png
imported>Shauna
(screenshot for Practicing Git: Merge conflicts - image 2 - github gui steps)
 
(Maintenance script uploaded File:Merge2.png)
 
(No difference)