From c15652232b0f70f91178f0721545c1d905a242f9 Mon Sep 17 00:00:00 2001
From: guipublic <guipublic@gmail.com>
Date: Mon, 3 Jun 2024 15:46:12 +0000
Subject: [PATCH] fix merge issues #2

---
 .../src/barretenberg/dsl/acir_format/block_constraint.test.cpp  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
index 2310bd14cdd..57a77d6dbbf 100644
--- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp
@@ -193,7 +193,6 @@ TEST_F(MegaHonk, Databus)
         .logic_constraints = {},
         .range_constraints = {},
         .aes128_constraints = {},
-        .sha256_constraints = {},
         .sha256_compression = {},
         .schnorr_constraints = {},
         .ecdsa_k1_constraints = {},
@@ -297,7 +296,6 @@ TEST_F(MegaHonk, DatabusReturn)
         .logic_constraints = {},
         .range_constraints = {},
         .aes128_constraints = {},
-        .sha256_constraints = {},
         .sha256_compression = {},
         .schnorr_constraints = {},
         .ecdsa_k1_constraints = {},