Skip to content

Commit 301d39f

Browse files
Nick GreenfieldNick Greenfield
authored andcommitted
fix: resolve remaining conflict markers in azure-deploy SKILL.md
1 parent 5f4cd17 commit 301d39f

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

plugin/skills/azure-deploy/SKILL.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,5 @@ Activate this skill when user wants to:
8585

8686
## References
8787

88-
<<<<<<< HEAD
8988
- [Troubleshooting](references/troubleshooting.md) - Common issues and solutions
9089
- [Post-Deployment Steps](references/recipes/azd/post-deployment.md) - SQL + EF Core setup
91-
- [Durable Task Scheduler Deployment](references/recipes/azd/durable-task-scheduler-deploy.md) - DTS provisioning, Bicep, and managed identity setup
92-
=======
93-
- [Troubleshooting](references/troubleshooting.md) - Common issues and solutions
94-
>>>>>>> 0e0ef37 (revert: remove DTS deploy recipe from azure-deploy skill)

0 commit comments

Comments
 (0)