GitHub repository: tmikeschu/conflict-practice
Created: 2017-01-04T17:13:29Z
Description: Practice git workflow