tokio-rs/bytes
1
0
Fork 0
mirror of https://github.com/tokio-rs/bytes.git synced 2026-08-28 00:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflict marker.

Browse Source
This commit is contained in:
Bruce Mitchener
2019-07-16 11:18:49 -07:00
committed by Sean McArthur
parent dea868a4b0
commit 9b5e33d6f0
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
-1
View File
@@ -21,7 +21,6 @@
* Add 128 bit number support behind a feature flag (#209). * Add 128 bit number support behind a feature flag (#209).
* Implement `IntoBuf` for `&mut [u8]` * Implement `IntoBuf` for `&mut [u8]`
>>>>>>> v0.4.x
# 0.4.8 (May 25, 2018) # 0.4.8 (May 25, 2018)