GitHub repository: snoopy831002/conflict
Primary language: HTML
Created: 2017-02-04T18:17:22Z
Description: demonstration of how conflict show up in git