GitHub repository: EtherTyper/github-conflict
Primary language: Ruby
Created: 2016-12-13T01:48:55Z
Description: Testing GitHub's ability to resolve merge conflicts!