aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-10-02 15:48:43 +0200
committerJohn Högberg <[email protected]>2017-10-02 15:52:24 +0200
commitfb2a3412ea80327458fd26a7135c0039e38dc827 (patch)
tree6608e755d38bcdb1040c858f35b07c102ea823e6 /erts
parent2257a0a2debf0a390e887e09c85bf14ba186f278 (diff)
downloadotp-fb2a3412ea80327458fd26a7135c0039e38dc827.tar.gz
otp-fb2a3412ea80327458fd26a7135c0039e38dc827.tar.bz2
otp-fb2a3412ea80327458fd26a7135c0039e38dc827.zip
Fix zlib merge snafu
I accidentally merged a few fixes directly to maint-20 (and then to maint and master), instead of merging to maint and master and waiting for a patch to merge it into maint-20, leaving the related tickets dangling. This commit does nothing beyond getting the tickets (and their release notes) into the next patch.
Diffstat (limited to 'erts')
-rw-r--r--erts/preloaded/src/zlib.erl2
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).