Open Source Comes to Campus/Curriculum/Git/Students: Difference between revisions

To resolve the conflict, scroll through the document until you find sections with these markings. The " ========" line separates the two options that are in conflict. Choose which one you want to keep by deleting the other. Then delete all of the markings. Do this for each conflict and then save and exit the file.