GitHub repository: mpgeek/Merge-Conflict-Demo
Created: 2016-04-18T22:32:31Z
Description: A garbage repo for demoing how to resolve a merge conflict