Use this repo to teach students how to deal with git conflicts.
This repository has been archived by the owner on Mar 7, 2020. It is now read-only.
rarichardson92/demo-git-conflict
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.