jeans/home-assistant.io
jeans/home-assistant.io
1
0
Fork 0
mirror of https://github.com/home-assistant/home-assistant.io.git synced 2025-07-28 03:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voip fix merge conflict (#27222)

Browse Source
This commit is contained in:
c0ffeeca7 2023-05-01 09:30:34 +02:00 committed by GitHub
parent 2562c923c8
commit 81343b6107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/_integrations/voip.markdown
View File

@ -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))
<p class='img'>
<img src="/images/integrations/voip/voip_adapter.png" />