Resolve conflict

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

config.mk

@@ -366,13 +366,9 @@ ifeq ($(WITH_COVERAGE),yes)
 endif
 
 ifeq ($(WITH_CJSON),yes)
-<<<<<<< cc47eaba09d024fc76915f3fd42c364b7cf5b309
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON
-=======
-	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson
+	BROKER_CFLAGS:=$(BROKER_CFLAGS) -DWITH_CJSON
 	BROKER_LDADD:=$(BROKER_LDADD) -lcjson
-	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson
->>>>>>> Bridge Dynamic Update 2.0.0
+	CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON
 	CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson
 	CLIENT_STATIC_LDADD:=$(CLIENT_STATIC_LDADD) -lcjson
 	CLIENT_LDFLAGS:=$(CLIENT_LDFLAGS)

travis-install.sh

@@ -10,10 +10,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
 fi
 
 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-<<<<<<< cc47eaba09d024fc76915f3fd42c364b7cf5b309
-=======
-	#brew update
->>>>>>> Bridge Dynamic Update 2.0.0
 	HOMEBREW_NO_AUTO_UPDATE=1 brew install c-ares cjson openssl libwebsockets
 fi