GitHub repository: oliverjam/merge-conflict-demo
Primary language: HTML
Created: 2017-07-05T08:54:00Z
Description: Demonstrating how to deal with a merge conflict