From f9f09e9156d0115b0a26a799d960e5516a0e35dc Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Thu, 27 Apr 2023 13:34:31 -0500 Subject: [PATCH] Fix tutorial link (#27173) --- source/_integrations/voip.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/_integrations/voip.markdown b/source/_integrations/voip.markdown index 34c1bd80116..5d6cdb8dfb9 100644 --- a/source/_integrations/voip.markdown +++ b/source/_integrations/voip.markdown @@ -12,7 +12,11 @@ ha_domain: voip ha_integration_type: integration --- +<<<<<<< HEAD The VoIP integration enables users to talk to [Assist](/docs/assist) using an analog phone and a VoIP adapter such as the [Grandstream HT801](https://amzn.to/40k7mRa). See [the tutorial](/projects/worlds-most-private-voice-assistant) for detailed instructions. +======= +The VoIP integration enables users to talk to [Assist](/docs/assist) using an analog phone and a VoIP adapter such as the [Grandstream HT801](https://amzn.to/40k7mRa). See [the tutorial](/projects/worlds-most-private-voice-assistant/) for detailed instructions. +>>>>>>> d248f51168 (Fix tutorial link (#27173))