@codingame/monaco-vscode-user-data-sync-service-override 2.2.2 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-user-data-sync-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": {
|
|
6
6
|
"name": "CodinGame",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"module": "index.js",
|
|
19
19
|
"types": "index.d.ts",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"vscode": "npm:@codingame/monaco-vscode-api@
|
|
21
|
+
"vscode": "npm:@codingame/monaco-vscode-api@3.0.0",
|
|
22
22
|
"vscode-marked": "npm:marked@=3.0.2"
|
|
23
23
|
}
|
|
24
24
|
}
|
|
@@ -1046,12 +1046,12 @@ let UserDataSyncWorkbenchContribution = class UserDataSyncWorkbenchContribution
|
|
|
1046
1046
|
})));
|
|
1047
1047
|
}
|
|
1048
1048
|
getShowConflictsTitle() {
|
|
1049
|
-
return
|
|
1049
|
+
return ( localize2WithPath(
|
|
1050
1050
|
'vs/workbench/contrib/userDataSync/browser/userDataSync',
|
|
1051
1051
|
'resolveConflicts_global',
|
|
1052
1052
|
"Show Conflicts ({0})",
|
|
1053
1053
|
this.getConflictsCount()
|
|
1054
|
-
))
|
|
1054
|
+
));
|
|
1055
1055
|
}
|
|
1056
1056
|
registerShowConflictsAction() {
|
|
1057
1057
|
this.conflictsActionDisposable.value = undefined;
|