Resolve conflicts in app/assets/javascripts/pages/search/init_filtered_search.js

9130cfb7 · Stan Hu · 03247eae · 9130cfb7
Commit 9130cfb7 authored Mar 01, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js .../pages/projects/merge_requests/init_merge_request_show.js +0 -4

No files found.
--- a/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js
@@ -30,7 +30,3 @@ export default function () {
  howToMerge();
  initWidget();
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master