summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-03-01 23:27:31 +0000
committerJacob Schatz <jschatz@gitlab.com>2018-03-01 23:27:31 +0000
commit77346c19555b3c5aa299e16c13af725feee220ec (patch)
treed2dde44d79cd57e6c818404632d80247117cb4a6
parent5c4eace67f188da436b3b380a0125d053b29422a (diff)
downloadgitlab-ce-77346c19555b3c5aa299e16c13af725feee220ec.tar.gz
Remove trailing newline that was causing an EE conflict
-rw-r--r--app/assets/javascripts/pages/projects/issues/show.js1
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/init_merge_request_show.js1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/assets/javascripts/pages/projects/issues/show.js b/app/assets/javascripts/pages/projects/issues/show.js
index 37503cc1542..500fbd27340 100644
--- 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();
}
-
diff --git 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
index da27c22f537..28d8761b502 100644
--- 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();
}
-