Skip to content

Commit

Permalink
Fix broken links due to the renumbering of the files.
Browse files Browse the repository at this point in the history
  • Loading branch information
iglpdc committed Feb 22, 2015
1 parent 62f8583 commit 3c0f21d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions instructors.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ Wolfman and Dracula will work together in one project.

FIXME

## [Collaborating](02-collab.html)
## [Collaborating](06-collab.html)

FIXME

## [Conflicts](03-conflict.html)
## [Conflicts](07-conflict.html)

FIXME

## [Open Science](04-open.html)
## [Open Science](08-open.html)

FIXME
6 changes: 3 additions & 3 deletions reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ subtitle: Reference
* `git checkout` recovers old versions of files.
* The `.gitignore` file tells Git what files to ignore.

## [Collaborating](02-collab.html)
## [Collaborating](06-collab.html)

* A local Git repository can be connected to one or more remote repositories.
* Use the HTTPS protocol to connect to remote repositories until you have learned how to set up SSH.
Expand All @@ -28,13 +28,13 @@ subtitle: Reference
* `git clone` copies a remote repository to create a local repository
with a remote called `origin` automatically set up.

## [Conflicts](03-conflict.html)
## [Conflicts](07-conflict.html)

* Conflicts occur when two or more people change the same file(s) at the same time.
* The version control system does not allow people to blindly overwrite each other's changes.
Instead, it highlights conflicts so that they can be resolved.

## [Open Science](04-open.html)
## [Open Science](08-open.html)

* Open scientific work is more useful and more highly cited than closed.
* People who incorporate GPL'd software into theirs must make theirs open;
Expand Down

0 comments on commit 3c0f21d

Please sign in to comment.