From 586b6d7f340e270ccbc759fe8d1571dd757bedd0 Mon Sep 17 00:00:00 2001
From: Amir <amirsanni@gmail.com>
Date: Fri, 17 May 2019 00:13:12 +0100
Subject: [PATCH] Update comm.js
---
js/comm.js | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/js/comm.js b/js/comm.js
index bf4be29..ebd7c9e 100644
--- a/js/comm.js
+++ b/js/comm.js
@@ -19,7 +19,7 @@ var awaitingResponse;
var streamConstraints;
var myMediaStream;
let wsChat;
-<<<<<<< HEAD
+
const room = getRoom();
if(location.protocol === 'http:'){
@@ -28,17 +28,6 @@ if(location.protocol === 'http:'){
else{
wsChat = new WebSocket("wss://1410inc.xyz/wss/comm");
-=======
-
-const room = getRoom();
-
-if(location.protocol === 'http:'){
- wsChat = new WebSocket("ws://1410inc.xyz:8080/comm");
-}
-
-else{
- wsChat = new WebSocket("wss://1410inc.xyz:8080/wss2/comm");
->>>>>>> e96cbd3cbda49ec853b9ed4d0c795806f72b122c
}
window.addEventListener('load', function(){