fix conflict
test_socket/Makefile @@ -1,4 +1,3 @@ ROOT := .. PLATFORM=$(shell $(ROOT)/systype.sh) include $(ROOT)/Make.defines.$(PLATFORM)
