Skip to content

Commit beed3f7

Browse files
authored
Update tutorial-create-telemetry-rules.md
1 parent ebf4e54 commit beed3f7

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

articles/iot-central/preview/tutorial-create-telemetry-rules.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,5 @@ In this tutorial, you learned how to:
117117
Now that you've defined a threshold-based rule the suggested next step is to learn how to:
118118

119119
> [!div class="nextstepaction"]
120-
<<<<<<< HEAD:articles/iot-central/core/tutorial-create-telemetry-rules-pnp.md
121-
> [Create a webhook action](./howto-create-webhooks-pnp.md?toc=/azure/iot-central-pnp/toc.json&bc=/azure/iot-central-pnp/breadcrumb/toc.json).
122-
=======
120+
123121
> [Configure continuous data export](./howto-export-data.md).
124-
>>>>>>> fa07415cf19e8cdb02d570edb3785780bfa97a7c:articles/iot-central/preview/tutorial-create-telemetry-rules.md

0 commit comments

Comments
 (0)