Commit 76a5ca52 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in doc/user/project/import/index.md

parent 3fc8e1da
......@@ -12,10 +12,7 @@
1. [From TFS](tfs.md)
1. [From repo by URL](repo_by_url.md)
1. [By uploading a manifest file (AOSP)](manifest.md)
<<<<<<< HEAD
1. [From Gemnasium](gemnasium.md)
=======
>>>>>>> upstream/master
In addition to the specific migration documentation above, you can import any
Git repository via HTTP from the New Project page. Be aware that if the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment