Skip to content

Commit fa5ff4a

Browse files
Update azure-resources-md
Removed conflicts at Next Steps
1 parent dcc1a4e commit fa5ff4a

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

articles/azure-sql-edge/deploy-azure-resources.md renamed to articles/azure-sql-edge/tutorial-deploy-azure-resources.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,6 @@ az vm run-command invoke -g $ResourceGroup -n $EdgeDeviceId --command-id RunShe
234234
```powershell
235235
az ml workspace create -w $MyWorkSpace -g $ResourceGroup
236236
```
237-
<<<<<<< HEAD
238237
## Next Steps
239238

240239
* [Set up IoT Edge Modules](set-up-iot-edge-modules.md)
241-
=======
242-
243-
## Next Steps
244-
245-
- [Setting up IoT Edge modules and connections](set-up-iot-edge-modules.md)
246-
>>>>>>> 50f5ab686ad02827c22552bc296bc47031d7d113

0 commit comments

Comments
 (0)