GitHub repository: BBoughton84/pushpullmergeconflict
Primary language: HTML
Created: 2017-02-03T18:01:25Z
Description: for testing purposes of merging with conflicts and typical issues in GitHub.