Resolve conflicts in doc/user/project/labels.md

c859a8b9 · Stan Hu · 4ed3b8df · c859a8b9
Commit c859a8b9 authored Aug 07, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/user/project/labels.md doc/user/project/labels.md +0 -4

No files found.
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -82,11 +82,7 @@ top-right:

 GitLab will consider the label title and description for the search.

-<<<<<<< HEAD
 ## Filtering issues, merge requests and epics by label
-=======
-## Filtering issues and merge requests by label
->>>>>>> upstream/master

 ### Filtering in list pages