mirror of
https://github.com/openharmony/third_party_rust_bytes.git
synced 2026-07-19 17:05:29 -04:00
Remove merge conflict marker.
This commit is contained in:
committed by
Sean McArthur
parent
5d0fba0e97
commit
d3df7bbb77
@@ -21,7 +21,6 @@
|
||||
|
||||
* Add 128 bit number support behind a feature flag (#209).
|
||||
* Implement `IntoBuf` for `&mut [u8]`
|
||||
>>>>>>> v0.4.x
|
||||
|
||||
# 0.4.8 (May 25, 2018)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user