Skip to content

G
gitlab-ce
Commit 862821d8 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflict in doc/administration/uploads.md

parent a4b5a5e6
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/administration/uploads.md
View file @ 862821d8
...@@ -51,11 +51,7 @@ _The uploads are stored by default in ...@@ -51,11 +51,7 @@ _The uploads are stored by default in
### Using object storage **[PREMIUM]** ### Using object storage **[PREMIUM]**
>**Notes:** >**Notes:**
<<<<<<< HEAD
- [Introduced][ee-3867] in [GitLab Premium][eep] 10.5.
=======
- [Introduced][ee-3867] in [GitLab Enterprise Edition Premium][eep] 10.5. - [Introduced][ee-3867] in [GitLab Enterprise Edition Premium][eep] 10.5.
>>>>>>> upstream/master
- Since version 11.1, we support direct_upload to S3. - Since version 11.1, we support direct_upload to S3.
If you don't want to use the local disk where GitLab is installed to store the If you don't want to use the local disk where GitLab is installed to store 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