diff options
author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
---|---|---|
committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-11 16:27:30 +0100 |
commit | 0fe784cbfb56a701259d83c989341afb1b7bc124 (patch) | |
tree | 099ec5f39984c031b2403f75b1958be93e46d882 /.babelrc | |
parent | 7d0a1285a10fcb4735c20e21d83367159402a06d (diff) | |
parent | 27732df37178c3a07c99304406dfdb41fa8b3670 (diff) | |
download | gitlab-ce-0fe784cbfb56a701259d83c989341afb1b7bc124.tar.gz |
Resolved conflicts in dispatcher.jshelp-profiles-dispatcher-refactor
Diffstat (limited to '.babelrc')
-rw-r--r-- | .babelrc | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -8,7 +8,8 @@ "plugins": [ ["istanbul", { "exclude": [ - "spec/javascripts/**/*" + "spec/javascripts/**/*", + "app/assets/javascripts/locale/**/app.js" ] }], ["transform-define", { |