File:Merge1.png: Difference between revisions

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