Commit 83d6e47c authored by Jacob Schatz's avatar Jacob Schatz
Browse files

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
...@@ -11,4 +11,3 @@ export default function () { ...@@ -11,4 +11,3 @@ export default function () {
new ZenMode(); // eslint-disable-line no-new new ZenMode(); // eslint-disable-line no-new
initIssuableSidebar(); initIssuableSidebar();
} }
...@@ -30,4 +30,3 @@ export default function () { ...@@ -30,4 +30,3 @@ export default function () {
howToMerge(); howToMerge();
initWidget(); initWidget();
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment