/demo-merge-conflicts

demo-merge-conflicts

This repo is intended to demonstrate an issue where I am able to merge branches locally, but GitHub gives a merge conflict.