Merge branch 'ce-to-ee-2018-08-21' of gitlab.com:gitlab-org/gitlab-ee into ce-to-ee-2018-08-21

bc059221 · Chantal Rollison · 96658b6d · f0cdb9f6 · bc059221
Commit bc059221 authored Aug 21, 2018 by Chantal Rollison
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

README.md README.md +0 -4

No files found.
--- a/README.md
+++ b/README.md
@@ -88,11 +88,7 @@ You can access a new installation with the login **`root`** and password **`5ive

 ## Contributing

-<<<<<<< HEAD
-GitLab is an open source project and we are very happy to accept community contributions. Please refer to [Contributing to GitLab page](https://about.gitlab.com/contributing/) for details.
-=======
 GitLab is an open source project and we are very happy to accept community contributions. Please refer to [Contributing to GitLab page](https://about.gitlab.com/contributing/) for more details.
->>>>>>> upstream/master

 ## Licensing