diff options
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/nifs/common/socket_nif.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |