Merge pull request #576 from AztecProtocol/cb/merge-train-barretenberg-fix

iakovenkos · web-flow · commit 24f62d0e1ca2 · 2026-07-06T17:38:30.000+02:00
fix: resolve merge-train/barretenberg ← next conflict (common/map.hpp) — layer 2 of 2
diff --git a/barretenberg/cpp/src/barretenberg/common/map.hpp b/barretenberg/cpp/src/barretenberg/common/map.hpp
@@ -32,8 +32,4 @@ std::array<OutElem, SIZE> map(std::array<InElem, SIZE> const& in, F&& op)
     std::transform(in.begin(), in.end(), result.begin(), op);
     return result;
 }
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/next
 } // namespace bb::transform

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,4 @@ std::array<OutElem, SIZE> map(std::array<InElem, SIZE> const& in, F&& op)`
`32`	`32`	`std::transform(in.begin(), in.end(), result.begin(), op);`
`33`	`33`	`return result;`
`34`	`34`	`}`
`35`		`-<<<<<<< HEAD`
`36`		`-`
`37`		`-=======`
`38`		`->>>>>>> origin/next`
`39`	`35`	`} // namespace bb::transform`