Skip to content
Snippets Groups Projects
Commit 9b5e33d6 authored by Bruce Mitchener's avatar Bruce Mitchener Committed by Sean McArthur
Browse files

Remove merge conflict marker.

parent dea868a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
CHANGELOG.md
+ 0
− 1
View file @ 9b5e33d6
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment