From 0141b5138cbdb6f20986d3c775e82bccaf4187d2 Mon Sep 17 00:00:00 2001
From: CPerezz <c.perezbaro@gmail.com>
Date: Sat, 2 Mar 2024 21:04:52 +0100
Subject: [PATCH] fix: Rebase conflicts

---
 halo2_backend/src/plonk.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/halo2_backend/src/plonk.rs b/halo2_backend/src/plonk.rs
index 938dba3124..36bb5c245e 100644
--- 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;