Resolve conflicts in doc/user/markdown.md

3e0a7a71 · Bob Van Landuyt · 4a1c3f42 · 3e0a7a71
Commit 3e0a7a71 authored Sep 06, 2018 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 23 deletions

doc/user/markdown.md doc/user/markdown.md +20 -23

No files found.
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -24,10 +24,7 @@ You can use GFM in the following areas:
 - snippets (the snippet must be named with a `.md` extension)
 - wiki pages
 - markdown documents inside the repository
-<<<<<<< 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.