Resolve conflict in app/views/projects/_md_preview.html.haml

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/views/projects/_md_preview.html.haml

@@ -2,11 +2,7 @@
 
 - if defined?(@merge_request) && @merge_request.discussion_locked?
   .issuable-note-warning
-<<<<<<< HEAD
-    = icon('lock')
-=======
     = icon('lock', class: 'icon')
->>>>>>> ce-com/master
     %span
       = _('This merge request is locked.')
       = _('Only project members can comment.')