Merge branch 'sh-remove-trailing-lines' into 'master'

Remove trailing newline that was causing an EE conflict See merge request gitlab-org/gitlab-ce!17465

Merge branch 'sh-remove-trailing-lines' into 'master'
Remove trailing newline that was causing an EE conflict See merge request gitlab-org/gitlab-ce!17465
257af80e · Jacob Schatz · 5c4eace6 · 77346c19 · 257af80e · 257af80e
Commit 257af80e authored Mar 01, 2018 by Jacob Schatz
2 changed files
--- a/app/assets/javascripts/pages/projects/issues/show.js
+++ b/app/assets/javascripts/pages/projects/issues/show.js
@@ -11,4 +11,3 @@ export default function () {
  new ZenMode(); // eslint-disable-line no-new
  initIssuableSidebar();
 }
-
--- 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,4 +30,3 @@ export default function () {
  howToMerge();
  initWidget();
 }
-