From 1f6fa8d7717146c1424913e72b6396f6c3669b53 Mon Sep 17 00:00:00 2001 From: Tifaifai Maupiti Date: Fri, 11 Dec 2020 09:21:45 +0100 Subject: [PATCH] Resolve conflict Signed-off-by: Tifaifai Maupiti --- config.mk | 8 ++------ travis-install.sh | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config.mk b/config.mk index a8c4fb09..a204b3f7 100644 --- a/config.mk +++ b/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) diff --git a/travis-install.sh b/travis-install.sh index dbd0f581..4e727a65 100755 --- a/travis-install.sh +++ b/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