Resolve conflict in doc/user/project/web_ide/index.md

f593f5f5 · Stan Hu · ea0be233 · f593f5f5
Commit f593f5f5 authored Apr 17, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/user/project/web_ide/index.md doc/user/project/web_ide/index.md +0 -4

No files found.
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
 # Web IDE
 > [Introduced in](https://gitlab.com/gitlab-org/gitlab-ee/issues/4539) [GitLab Ultimate][ee] 10.4.
-<<<<<<< HEAD
 > [Brought to GitLab Core](https://gitlab.com/gitlab-org/gitlab-ce/issues/44157) in 10.7.
-=======
-> [Brought to GitLab Core][core](https://gitlab.com/gitlab-org/gitlab-ce/issues/44157) in 10.7.
->>>>>>> upstream/master
 The Web IDE editor makes it faster and easier to contribute changes to your
 projects by providing an advanced editor with commit staging.