/contrived-conflict

A repository with a simple contrived conflict for testing or demonstrating merge conflict resolution

CONTRIVED CONFLICT

This is an awesome README.md file.