fix rebase issues

rust-num · Aug 7, 2018 · 6ed4f0e · 6ed4f0e
1 parent 64454d7
commit 6ed4f0e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git 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
@@ -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)
 }