| commit | 82603897fae9b70be4499e91345e23fc31ddbf17 | [log] [tgz] |
|---|---|---|
| author | Aaron Green <aarongreen@pigweed.infra.roller.google.com> | Thu Apr 25 18:04:10 2024 +0000 |
| committer | CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Apr 25 18:04:10 2024 +0000 |
| tree | 388eedcc604c311473747ba3950d4ed9dbac3cb5 | |
| parent | 6c1d4d6935f8e44b1f0774c7809a6885008737d8 [diff] |
[roll third_party/pigweed] pw_allocator: Remove conflict marker Original-Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/206590 https://pigweed.googlesource.com/pigweed/pigweed third_party/pigweed Rolled-Commits: 46f6477f64d1411..f3299bee142a088 Roller-URL: https://ci.chromium.org/b/8749663618825097777 GitWatcher: ignore CQ-Do-Not-Cancel-Tryjobs: true Change-Id: I44f9ce9bc492fd834d97c6e5fc4f8f5e27589a77 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/examples/+/206512 Commit-Queue: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com> Bot-Commit: Pigweed Roller <pigweed-roller@pigweed-service-accounts.iam.gserviceaccount.com>
diff --git a/third_party/pigweed b/third_party/pigweed index 46f6477..f3299be 160000 --- a/third_party/pigweed +++ b/third_party/pigweed
@@ -1 +1 @@ -Subproject commit 46f6477f64d1411f920535f388368c5ca47dd46c +Subproject commit f3299bee142a088f7c731358af524565a2ff625d