From 81343b6107eb38fdeb71af6207038cf3818f1031 Mon Sep 17 00:00:00 2001 From: c0ffeeca7 <38767475+c0ffeeca7@users.noreply.github.com> Date: Mon, 1 May 2023 09:30:34 +0200 Subject: [PATCH] Voip fix merge conflict (#27222) --- source/_integrations/voip.markdown | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/_integrations/voip.markdown b/source/_integrations/voip.markdown index 5d6cdb8dfb9..fa3f706d8f4 100644 --- a/source/_integrations/voip.markdown +++ b/source/_integrations/voip.markdown @@ -12,11 +12,7 @@ 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))