GitHub repository: khsieh/merge_conflict_test
Primary language: Java
Created: 2018-02-14T01:49:20Z
Description: demo repo to show off how to resolve a merge conflict