Fix merge issues

This commit is contained in:
2019-12-04 00:30:23 -05:00
parent 7a0a5725b7
commit 77a3ba9f69
5 changed files with 19 additions and 108 deletions

View File

@@ -43,5 +43,5 @@
"last 1 safari version"
]
},
"proxy": "http://localhost:5001/twistter-e4649/us-central1/api"
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api"
}