Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/ptb/extensions/merge-conflict/package.i18n.json')
-rw-r--r--i18n/ptb/extensions/merge-conflict/package.i18n.json1
1 files changed, 0 insertions, 1 deletions
diff --git a/i18n/ptb/extensions/merge-conflict/package.i18n.json b/i18n/ptb/extensions/merge-conflict/package.i18n.json
index 71f0888573b..1aa2e946156 100644
--- a/i18n/ptb/extensions/merge-conflict/package.i18n.json
+++ b/i18n/ptb/extensions/merge-conflict/package.i18n.json
@@ -7,7 +7,6 @@
"Do not edit this file. It is machine generated."
],
"displayName": "Mesclar conflitos",
- "description": "Coloração e comandos para conflitos de mesclagem em linha.",
"command.category": "Conflito de Mesclagem",
"command.accept.all-current": "Aceitar Todos os Atuais",
"command.accept.all-incoming": "Aceitar todas entradas",