Resolve merge conflicts in ttcn/patch_abstract_socket/Abstract_Socket.cc.patch