GitHub repository: xero/conflix
Primary language: JavaScript
Created: 2018-09-21T18:56:05Z
Description: merge conflict resolution demo repo