diff options
| author | Erlang/OTP <[email protected]> | 2017-10-02 15:55:10 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-02 15:55:10 +0200 |
| commit | cdfe0befcbf4fb8efe3dd7476cfff271eff03c37 (patch) | |
| tree | 675524d7bc5da347aa8b81062e9b5d4e98f97007 | |
| parent | 767fe3ce59eecbd8f8dac911a9117b1c265ce527 (diff) | |
| parent | fb2a3412ea80327458fd26a7135c0039e38dc827 (diff) | |
| download | otp-cdfe0befcbf4fb8efe3dd7476cfff271eff03c37.tar.gz otp-cdfe0befcbf4fb8efe3dd7476cfff271eff03c37.tar.bz2 otp-cdfe0befcbf4fb8efe3dd7476cfff271eff03c37.zip | |
Merge branch 'john/erts/fix-zlib-merge/OTP-14648/OTP-14649' into maint-20
* john/erts/fix-zlib-merge/OTP-14648/OTP-14649:
Fix zlib merge snafu
| -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). |