Resolve conflicts

src/proof_system/preprocess.rs

@@ -121,15 +121,7 @@ impl TurboComposer {
         let (_, selectors, preprocessed_table, domain) =
             self.preprocess_shared(commit_key, transcript)?;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
         // The polynomial needs an evaluation domain of 4n.
-=======
-        // the polynomial needs an evaluation domain of 4n.
->>>>>>> 7fb83c2 (Revert move blind to Polynomial)
-=======
-        // The polynomial needs an evaluation domain of 4n.
->>>>>>> 8746288 (Fix minor issues)
         // Plus, adding the blinding factors translates to
         // the polynomial not fitting in 4n, so now we need
         // 8n, the next power of 2

src/proof_system/prover.rs

@@ -149,18 +149,8 @@ impl Prover {
 
     /// Adds the blinding scalars to a given vector. Always the same elements
     /// of 'w_vec' are modified at the beginning of it, and appended at the end:
-<<<<<<< HEAD
-<<<<<<< HEAD
     /// if hiding degree = 1: (b2*X^(n+1) + b1*X^n - b2*X - b1) + w_vec
     /// if hiding degree = 2: (b3*X^(n+2) + b2*X^(n+1) + b1*X^n - b3*X^2 - b2*X
-=======
-    /// if hiding degree = 1: (b2*X(n+1) + b1*X^n - b2*X - b1) + w_vec
-    /// if hiding degree = 2: (b3*X^(n+2) + b2*X(n+1) + b1*X^n - b3*X^2 - b2*X
->>>>>>> 7fb83c2 (Revert move blind to Polynomial)
-=======
-    /// if hiding degree = 1: (b2*X^(n+1) + b1*X^n - b2*X - b1) + w_vec
-    /// if hiding degree = 2: (b3*X^(n+2) + b2*X^(n+1) + b1*X^n - b3*X^2 - b2*X
->>>>>>> 8746288 (Fix minor issues)
     /// - b1) + w_vec
     pub(crate) fn blind_poly<R: RngCore + CryptoRng>(
         w_vec: &Vec<BlsScalar>,