merge conflict

This commit is contained in:
Chris Cochrun 2020-12-16 10:14:54 -06:00
commit 6022a5d849

View file

@ -6,6 +6,11 @@
config_version: 2
settings:
content.geolocation:
https://staff.tfcconnection.org: true
content.notifications:
https://www.reddit.com: false
https://www.tradingview.com: false
https://staff.tfcconnection.org: false
content.register_protocol_handler:
https://staff.tfcconnection.org: true