fix: Rebase conflicts

privacy-scaling-explorations · Mar 2, 2024 · 0141b51 · 0141b51
1 parent 1c0642c
commit 0141b51
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/halo2_backend/src/plonk.rs b/halo2_backend/src/plonk.rs
@@ -7,6 +7,7 @@ use crate::helpers::{
     SerdeCurveAffine, SerdePrimeField,
 };
 use crate::poly::{Coeff, EvaluationDomain, LagrangeCoeff, PinnedEvaluationDomain, Polynomial};
+use crate::transcript::{ChallengeScalar, EncodedChallenge, Transcript};
 use evaluation::Evaluator;
 use halo2_common::plonk::{Circuit, ConstraintSystem, PinnedConstraintSystem};
 use halo2_common::SerdeFormat;