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

dc41b06e · Stan Hu · 9130cfb7 · dc41b06e
Commit dc41b06e 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/issues/show.js app/assets/javascripts/pages/projects/issues/show.js +0 -4

No files found.
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -11,7 +11,3 @@ export default function () {
  new ZenMode(); // eslint-disable-line no-new
  initIssuableSidebar();
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master