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
This commit is contained in:
commit
257af80e45
|
@ -11,4 +11,3 @@ export default function () {
|
|||
new ZenMode(); // eslint-disable-line no-new
|
||||
initIssuableSidebar();
|
||||
}
|
||||
|
||||
|
|
|
@ -30,4 +30,3 @@ export default function () {
|
|||
howToMerge();
|
||||
initWidget();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue