diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-17 20:21:25 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-21 06:12:01 +0300 |
| commit | d9dedc36c39abea9464551864094706cdad1bac0 (patch) | |
| tree | 25a5b2c3a9e1e312a76d1181e7b1e0961e9fa35e /app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | |
| parent | 2cdfbbfc2f4b6e7627d1be43635bba64d082e803 (diff) | |
remove Vue from the global space
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js index 653e52fb6bf..15992460146 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js @@ -1,8 +1,8 @@ /* eslint-disable new-cap, comma-dangle, no-new */ -/* global Vue */ /* global Flash */ -window.Vue = require('vue'); +import Vue from 'vue'; + require('./merge_conflict_store'); require('./merge_conflict_service'); require('./mixins/line_conflict_utils'); |