Fix broken build from git shennanigans

rust-lang · Nov 1, 2022 · 675f227 · 675f227
1 parent 5b1abce
commit 675f227
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -81,8 +81,6 @@ const BUFSIZE: usize = 2048;
 ///           '_   -   _'
 ///           / '-----' \
 /// ```
-<<<<<<< HEAD
-
 pub fn say<W>(input: &str, max_width: usize, mut writer: W) -> Result<()>
 where
     W: Write,