commit 2daa12670953218836eac24d743ff219b9556636
author Yang Gao <yangg@google.com> Mon Mar 09 22:25:28 2015 -0700
committer Yang Gao <yangg@google.com> Mon Mar 09 22:25:28 2015 -0700
tree 6e5c66a96361dc7224d0027f532ff6117146b645
parent 2365ad193b45ed10c2becaedef6a72b1bf185097
parent 072b561654a4980216a2482e4df008b7ac36a9b1

resolve conflict

cpp/helloworld/Makefile

diff --git a/cpp/helloworld/Makefile b/cpp/helloworld/Makefile
index 0333cc2..bfa9c08 100644
--- a/cpp/helloworld/Makefile
+++ b/cpp/helloworld/Makefile
@@ -30,9 +30,9 @@
 #
 
 CXX = g++
-CPPFLAGS = -I/usr/local/include -pthread
-CXXFLAGS = -std=c++11
-LDFLAGS = -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl
+CPPFLAGS += -I/usr/local/include -pthread
+CXXFLAGS += -std=c++11
+LDFLAGS += -L/usr/local/lib -lgrpc++_unsecure -lgrpc -lgpr -lprotobuf -lpthread -ldl
 PROTOC = protoc
 GRPC_CPP_PLUGIN = grpc_cpp_plugin
 GRPC_CPP_PLUGIN_PATH ?= `which $(GRPC_CPP_PLUGIN)`