Merge pull request #5927 from lovett/patch-1

Clean up a merge conflict in repositories doc

doc/05-repositories.md

@@ -284,13 +284,8 @@ VCS repository provides `dist`s for them that fetch the packages as zips.
 * **BitBucket:** [bitbucket.org](https://bitbucket.org) (Git and Mercurial)
 
 The VCS driver to be used is detected automatically based on the URL. However,
-<<<<<<< HEAD
-should you need to specify one for whatever reason, you can use `fossil`,
-`git`, `svn` or `hg` as the repository type instead of `vcs`.
-=======
 should you need to specify one for whatever reason, you can use `fossil`, `git`,
 `svn` or `hg` as the repository type instead of `vcs`.
->>>>>>> 1.2
 
 If you set the `no-api` key to `true` on a github repository it will clone the
 repository as it would with any other git repository instead of using the