#743 - Trying to fix HACS and Alexa Media Player

6 years ago · 02c26811ad
parent 5c7334bc05 cd3d35d41e
commit 02c26811ad
1 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -33,5 +33,8 @@ nest.conf
 ipchange.yaml
 ip_bans.yaml
 production_auth.json
+<<<<<<< HEAD


+=======
+>>>>>>> cd3d35d41e65e707044ab7c865ab2f343a3e0a07