Skip to content

G
gitlab-ce
Commit 76a5ca52 authored by Stan Hu's avatar Stan Hu
Browse files
Options

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

parent 3fc8e1da
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
doc/user/project/import/index.md
View file @ 76a5ca52
...@@ -12,10 +12,7 @@ ...@@ -12,10 +12,7 @@
1. [From TFS](tfs.md) 1. [From TFS](tfs.md)
1. [From repo by URL](repo_by_url.md) 1. [From repo by URL](repo_by_url.md)
1. [By uploading a manifest file (AOSP)](manifest.md) 1. [By uploading a manifest file (AOSP)](manifest.md)
<<<<<<< HEAD
1. [From Gemnasium](gemnasium.md) 1. [From Gemnasium](gemnasium.md)
=======
>>>>>>> upstream/master
In addition to the specific migration documentation above, you can import any 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 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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7