diff options
Diffstat (limited to 'i18n/esn/extensions/merge-conflict/package.i18n.json')
| -rw-r--r-- | i18n/esn/extensions/merge-conflict/package.i18n.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/i18n/esn/extensions/merge-conflict/package.i18n.json b/i18n/esn/extensions/merge-conflict/package.i18n.json index abfab70acfe..0ca0776dd5a 100644 --- a/i18n/esn/extensions/merge-conflict/package.i18n.json +++ b/i18n/esn/extensions/merge-conflict/package.i18n.json @@ -7,6 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "Fusionar conflicto", + "description": "Resaltado y comandos para conflictos de fusión insertada.", "command.category": "Fusionar conflicto", "command.accept.all-current": "Aceptar todo actual", "command.accept.all-incoming": "Aceptar todos los entrantes", |