Skip to content

Commit

Permalink
Merge pull request #145 from iglpdc/quick-typo
Browse files Browse the repository at this point in the history
instructors.md: Fix typo "used" -> "uses"
  • Loading branch information
iglpdc committed May 15, 2015
2 parents 2aadcc4 + 6135f0d commit 04617e5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion instructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ subtitle: Instructor's Guide

We follow two scientists, Dracula and Wolfman, collaborating in a project. In
the first part of the lesson, Dracula is working by himself in his laptop and
used Git locally. In the second part of the lesson, he uploads his local repo
uses Git locally. In the second part of the lesson, he uploads his local repo
to GitHub ands add Wolfman as a collaborator. With both working in the same
project, conflicts arise and we see how to handle them with Git. The lesson
closes with a part on Open Science that is somewhat detached from the story.
Expand Down

0 comments on commit 04617e5

Please sign in to comment.