Fix link to pages/merge_conflicts.html

kbroman · kbroman · commit 2d4e05c9bb0e · 2013-05-10T01:36:34.000-05:00
diff --git a/index.md b/index.md
@@ -19,7 +19,7 @@ minimal guide to get started.
 - [Start a new repository](pages/init.html): from scratch, or with an
   existing project.
 - [Contribute to someone's repository](pages/fork.html)
-- [Handling merge conflicts](merge_conflicts.html)
+- [Handling merge conflicts](pages/merge_conflicts.html)
 - Oops; that last commit message was wrong
 - Exploring the code and its history
 - Resources
