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_conflict_store.js | |
| parent | 2cdfbbfc2f4b6e7627d1be43635bba64d082e803 (diff) | |
remove Vue from the global space
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/merge_conflict_store.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index 74587df22c5..07632d6225c 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,6 +1,7 @@ /* eslint-disable comma-dangle, object-shorthand, no-param-reassign, camelcase, no-nested-ternary, no-continue, max-len */ /* global Cookies */ -/* global Vue */ + +import Vue from 'vue'; ((global) => { global.mergeConflicts = global.mergeConflicts || {}; |