Resolve conflict in app/assets/javascripts/pages/projects/merge_requests/show/index.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/pages/projects/merge_requests/show/index.js

@@ -4,20 +4,4 @@ import initShow from '../init_merge_request_show';
 document.addEventListener('DOMContentLoaded', () => {
   initShow();
   initSidebarBundle();
-<<<<<<< HEAD
-=======
-  initNotes();
-  initDiffNotes();
-  initPipelines();
-
-  const mrShowNode = document.querySelector('.merge-request');
-  window.mergeRequest = new MergeRequest({
-    action: mrShowNode.dataset.mrAction,
-  });
-
-  new ShortcutsIssuable(true); // eslint-disable-line no-new
-  handleLocationHash();
-  howToMerge();
-  initWidget();
->>>>>>> upstream/master
 });