From 9e16882d12af0a20ae7cfc7d73e54de31c0ece65 Mon Sep 17 00:00:00 2001 From: Bill Lovett Date: Thu, 1 Dec 2016 09:44:35 -0500 Subject: [PATCH] Clean up a merge conflict in repositories doc A merge conflict slipped through recently, corrupting the page a bit. --- doc/05-repositories.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/05-repositories.md b/doc/05-repositories.md index c87b5618f..5299023ec 100644 --- a/doc/05-repositories.md +++ b/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