Resolve docs conflicts

5667c061 · Achilleas Pipinellis · fb894640 · 5667c061
Commit 5667c061 authored Nov 12, 2018 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/user/markdown.md doc/user/markdown.md +0 -3

No files found.
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -20,10 +20,7 @@ You can use GFM in the following areas:
 - Snippets (the snippet must be named with a `.md` extension)
 - Wiki pages
 - Markdown documents inside repositories
-<<<<<<< HEAD
 - Epics
-=======
->>>>>>> upstream/master
 You can also use other rich text files in GitLab. You might have to install a
 dependency to do so. Please see the [`github-markup` gem readme](https://github.com/gitlabhq/markup#markups) for more information.