swcarpentry/bc — pull request #574 by ctjacobs (2014-06-26 16:04:01+00:00)
Title: Fix image order in novice/git/03-conflict.md

Corrects the order of the images in the Git Conflicts section. Addresses #573.