[fish] Cleaning up bad merges

This commit is contained in:
2022-01-04 12:24:35 -05:00
parent add53a1901
commit a426f9f017
4 changed files with 37 additions and 2 deletions

View File

@ -13,6 +13,7 @@ settings:
content.geolocation:
https://app.zestful.com: true
https://box.unbl.ink: true
https://www.rcplanet.com: false
content.media.audio_capture:
https://15five.zoom.us: true
https://meet.google.com: true

View File

@ -9,3 +9,4 @@ https://app.slack.com/client/T042JGM5N/C0437D88S/thread/C0437D88S-1615565720.132
https://15five.15five.com/admin/dj/saml2/saml2config/?q=60027 Select Configuration to change | Django site admin
https://app.slack.com/client/T042JGM5N/G010U55A8CV/thread/G010U55A8CV-1637246877.000600 Slack | support-tier2 | 15Five
https://15five.lightning.force.com/lightning/r/Case/5004T00000BGbDBQA1/view 00018911 | Salesforce
https://www.figma.com/file/0qsXDQRmrdtoNaBmGIdD1Y/Partnerships-Team?node-id=518%3A23 Partnerships Team Figma