From d2215d7950d518530c563f253268e5bec93bbbe4 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Tue, 30 Jul 2019 17:12:04 +0200 Subject: [esock] Post merge fix --- erts/emulator/nifs/common/socket_nif.c | 1 - 1 file changed, 1 deletion(-) (limited to 'erts/emulator') diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c index 474ba518ed..881a9c7ccd 100644 --- a/erts/emulator/nifs/common/socket_nif.c +++ b/erts/emulator/nifs/common/socket_nif.c @@ -1124,7 +1124,6 @@ static ERL_NIF_TERM esock_accept_accepting_other(ErlNifEnv* env, ERL_NIF_TERM ref, ErlNifPid caller); static ERL_NIF_TERM esock_accept_busy_retry(ErlNifEnv* env, ->>>>>>> maint ESockDescriptor* descP, ERL_NIF_TERM sockRef, ERL_NIF_TERM accRef, -- cgit v1.2.3