Permalink
Browse files

Fixed merge conflict in CHANGELOG

  • Loading branch information...
mpilquist committed Aug 4, 2017
1 parent 2a66aa4 commit a83580e0957f27f83c5b5f2a97763ded1214ac45
Showing with 1 addition and 5 deletions.
  1. +1 −5 CHANGELOG.md
View
@@ -2,12 +2,8 @@
=====
- Empty deflated streams are now handled properly [#865](https://github.com/functional-streams-for-scala/fs2/pull/865)
- `concurrent.join` now fails when outer stream terminated [#869](https://github.com/functional-streams-for-scala/fs2/pull/869)
0.9.5
=======
0.9.5
>>>>>>> ab0d1d1a... Updated CHANGELOG for 0.9.7
0.9.5
=====
- Fixed memory leak in `concurrent.join` where up to `maxOpen` streams that had finished executing were kept in memory until the end of the outer stream was reached. [#834](https://github.com/functional-streams-for-scala/fs2/issues/834)
- Fixed a bug in `fs2.io.JavaInputOutputStream`, ensuring bytes are converted to 0-255 before being returned.

0 comments on commit a83580e

Please sign in to comment.