diff options
Diffstat (limited to 'app/assets/javascripts/merge_conflicts/utils.js')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/utils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_conflicts/utils.js b/app/assets/javascripts/merge_conflicts/utils.js index e42703ef0a5..cf7a7c304e3 100644 --- a/app/assets/javascripts/merge_conflicts/utils.js +++ b/app/assets/javascripts/merge_conflicts/utils.js @@ -9,7 +9,7 @@ import { export const getFilePath = (file) => { const { old_path, new_path } = file; - // eslint-disable-next-line babel/camelcase + // eslint-disable-next-line camelcase return old_path === new_path ? new_path : `${old_path} → ${new_path}`; }; @@ -71,7 +71,7 @@ export const getLineForParallelView = (line, id, lineType, isHead) => { isHead: hasConflict && isHead, isOrigin: hasConflict && !isHead, hasMatch: lineType === 'match', - // eslint-disable-next-line babel/camelcase + // eslint-disable-next-line camelcase lineNumber: isHead ? new_line : old_line, section: isHead ? 'head' : 'origin', richText: rich_text, |