GitHub repository: laurenarfaras/git_conflicts
Created: 2017-03-01T23:33:19Z
Description: Using to test how to work with git merge conflicts