Remove merge conflict marker.

This commit is contained in:
Bruce Mitchener
2019-07-09 17:54:14 +07:00
committed by Sean McArthur
parent 5d0fba0e97
commit d3df7bbb77
-1
View File
@@ -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)