Skip to content

Commit e4302d9

Browse files
committed
Resolve conflicts
1 parent e79398b commit e4302d9

File tree

36 files changed

+1800
-1800
lines changed

36 files changed

+1800
-1800
lines changed

Tasks/AzureFileCopyV6/Strings/resources.resjson/de-DE/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/es-ES/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/fr-FR/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/it-IT/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/ja-JP/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/ko-KR/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/ru-RU/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/zh-CN/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/AzureFileCopyV6/Strings/resources.resjson/zh-TW/resources.resjson

Lines changed: 91 additions & 91 deletions
Large diffs are not rendered by default.

Tasks/DockerComposeV0/Strings/resources.resjson/de-DE/resources.resjson

Lines changed: 85 additions & 85 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)