merge conflict

This commit is contained in:
Ali Abdalla 2019-02-19 02:06:53 -08:00
parent 597fc7f1cf
commit d8954ea2ac

View File

@ -1,5 +1,5 @@
var NGROK_URL = "ws://c71cced3.ngrok.io"
var NGROK_URL = "ws://ff05d843.ngrok.io"
var SOCKET_PORT = 9200
try {
var origin = window.location.origin;
if (origin.includes("ngrok")){