Fix for travis - websockets

Signed-off-by: Tifaifai Maupiti <tifaifai.maupiti@gmail.com>

config.mk

@@ -65,7 +65,7 @@ WITH_SYSTEMD:=no
 WITH_SRV:=no
 
 # Build with websockets support on the broker.
-WITH_WEBSOCKETS:=yes
+WITH_WEBSOCKETS:=no
 
 # Use elliptic keys in broker
 WITH_EC:=yes
@@ -125,11 +125,7 @@ WITH_XTREPORT=no
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto64.nsi
-<<<<<<< cc47eaba09d024fc76915f3fd42c364b7cf5b309
 VERSION=2.0.2
-=======
-VERSION=2.0.0.D
->>>>>>> Bridge Dynamic Update 2.0.0
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
 SOVERSION=1