Skip to content

Commit 3792807

Browse files
ShawnKupferShawnKupfer
committed
Fix merge conflicts
2 parents 80dc1bb + ca36d03 commit 3792807

File tree

2,883 files changed

+44400
-31366
lines changed

Some content is hidden

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

2,883 files changed

+44400
-31366
lines changed

‎.openpublishing.redirection.json

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

‎learn-pr/achievements.yml

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

‎learn-pr/achievements/develop-accessible-resize-reflow-social.png

103 KB
Loading

‎learn-pr/achievements/develop-accessible-resize-reflow.svg

Lines changed: 85 additions & 0 deletions
Loading

‎learn-pr/achievements/learn.azdo.automate-deployments-azure-devops.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.automate-deployments-azure-devops
2+
achievementUid: learn.azdo.automate-deployments-azure-devops.trophy
33
metadata:
44
title: >-
55
Microsoft Trophy: Automate your deployments with Azure DevOps was issued by

‎learn-pr/achievements/learn.azdo.capture-feedback-monitoring.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.capture-feedback-monitoring
2+
achievementUid: learn.azdo.capture-feedback-monitoring.trophy
33
metadata:
44
title: >-
55
Microsoft Trophy: Capture feedback and monitoring data to continuously

‎learn-pr/achievements/learn.azdo.configure-infrastructure-azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.configure-infrastructure-azure-pipelines
2+
achievementUid: learn.azdo.configure-infrastructure-azure-pipelines.badge
33
metadata:
44
title: >-
55
Microsoft Badge: Configure infrastructure in Azure Pipelines was issued by

‎learn-pr/achievements/learn.azdo.manage-database-changes-in-azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.manage-database-changes-in-azure-pipelines
2+
achievementUid: learn.azdo.manage-database-changes-in-azure-pipelines.badge
33
metadata:
44
title: >-
55
Microsoft Badge: Manage database changes in Azure Pipelines was issued by

‎learn-pr/achievements/learn.azdo.provision-databases-azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.provision-databases-azure-pipelines
2+
achievementUid: learn.azdo.provision-databases-azure-pipelines.badge
33
metadata:
44
title: >-
55
Microsoft Badge: Provision databases in Azure Pipelines was issued by

‎learn-pr/achievements/learn.azdo.provision-infrastructure-azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### YamlMime:AchievementDetail
2-
achievementUid: learn.azdo.provision-infrastructure-azure-pipelines
2+
achievementUid: learn.azdo.provision-infrastructure-azure-pipelines.badge
33
metadata:
44
title: >-
55
Microsoft Badge: Provision infrastructure in Azure Pipelines was issued by

0 commit comments

Comments
 (0)