Skip to content

Commit 941f8a7

Browse files
committed
Resolve conflicts
1 parent 51598ee commit 941f8a7

File tree

81 files changed

+4770
-4770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+4770
-4770
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/AzureFunctionAppV2/Strings/resources.resjson/de-DE/resources.resjson

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

0 commit comments

Comments
 (0)