From 6ed4f0e8ba0d7b0476197bf58791f42b12b55e2e Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Tue, 7 Aug 2018 12:54:00 +0200
Subject: [PATCH] fix rebase issues

---
 src/bigint.rs  | 7 -------
 src/biguint.rs | 5 -----
 2 files changed, 12 deletions(-)

diff --git a/src/bigint.rs b/src/bigint.rs
index 474a68a2..16caac46 100644
--- a/src/bigint.rs
+++ b/src/bigint.rs
@@ -710,16 +710,9 @@ impl ShlAssign<usize> for BigInt {
 // Negative values need a rounding adjustment if there are any ones in the
 // bits that are getting shifted out.
 fn shr_round_down(i: &BigInt, rhs: usize) -> bool {
-<<<<<<< HEAD
     i.is_negative() && biguint::trailing_zeros(&i.data)
         .map(|n| n < rhs)
         .unwrap_or(false)
-=======
-    i.is_negative()
-        && biguint::trailing_zeros(&i.data)
-            .map(|n| n < rhs)
-            .unwrap_or(false)
->>>>>>> chore: run rustfmt on all code
 }
 
 impl Shr<usize> for BigInt {
diff --git a/src/biguint.rs b/src/biguint.rs
index 13b6a9f3..1298c5d2 100644
--- a/src/biguint.rs
+++ b/src/biguint.rs
@@ -135,12 +135,7 @@ fn from_bitwise_digits_le(v: &[u8], bits: usize) -> BigUint {
                 .iter()
                 .rev()
                 .fold(0, |acc, &c| (acc << bits) | c as BigDigit)
-<<<<<<< HEAD
         }).collect();
-=======
-        })
-        .collect();
->>>>>>> chore: run rustfmt on all code
 
     BigUint::new(data)
 }