diff options
Diffstat (limited to 'i18n/jpn/extensions/merge-conflict/package.i18n.json')
| -rw-r--r-- | i18n/jpn/extensions/merge-conflict/package.i18n.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/jpn/extensions/merge-conflict/package.i18n.json b/i18n/jpn/extensions/merge-conflict/package.i18n.json index ae1af61b50b..a21287ee929 100644 --- a/i18n/jpn/extensions/merge-conflict/package.i18n.json +++ b/i18n/jpn/extensions/merge-conflict/package.i18n.json @@ -7,7 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "マージの競合", - "description": "行内マージ競合のカラーリングとコマンド。", + "description": "行内マージ競合のハイライト、コマンドを提供します。", "command.category": "マージの競合", "command.accept.all-current": "現在の方をすべて取り込む", "command.accept.all-incoming": "入力側のすべてを取り込む", |