From d3df7bbb778e482fd3fca0e6a1a7199acdd2c7c9 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 9 Jul 2019 17:54:14 +0700 Subject: [PATCH] Remove merge conflict marker. --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b538415..79d15b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)