diff options
| author | Hans Nilsson <[email protected]> | 2017-10-09 12:04:49 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-10-09 12:04:49 +0200 |
| commit | d68b3def1b2d448d1585182a0b987e79333b33b4 (patch) | |
| tree | ee03096415bb249e5cf52dc5ada7b5f8f0f1dd77 /erts/preloaded | |
| parent | d52b0496f9f6ef15a98a77749c11dd662a1a951f (diff) | |
| parent | 3f4aac5b00959d3f0ddfaf54a3163cd75053dd24 (diff) | |
| download | otp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.gz otp-d68b3def1b2d448d1585182a0b987e79333b33b4.tar.bz2 otp-d68b3def1b2d448d1585182a0b987e79333b33b4.zip | |
Merge branch 'maint' into hans/ssh/ssh_dbg_hostkey/OTP-14658
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 611010550f..3170ab6351 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -692,4 +692,4 @@ enqueue_input_1(Z, IOVec) -> end. enqueue_nif(_Z, _IOVec) -> - erlang:nif_error(undef).
\ No newline at end of file + erlang:nif_error(undef). |