diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 09:08:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 09:08:42 +0000 |
| commit | f14507e586a7f75f0fb71a1d8468b7361be860d4 (patch) | |
| tree | a8aa547b517a7ae5626c902bfb558c1fc5386c4e /app/assets/javascripts/merge_conflicts | |
| parent | f4d27d532e3abeecd1caffeb3a56e698ae982e5b (diff) | |
| download | gitlab-ce-f14507e586a7f75f0fb71a1d8468b7361be860d4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
1 files changed, 1 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 e7fcc183715..25c357b6073 100644 --- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js +++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js @@ -1,4 +1,4 @@ -/* eslint-disable no-param-reassign, camelcase, no-nested-ternary, no-continue */ +/* eslint-disable no-param-reassign, babel/camelcase, no-nested-ternary, no-continue */ import $ from 'jquery'; import Vue from 'vue'; |