commit | 1990541a70e3c0dad7aacd4689e841b801b3c6b4 | [log] [tgz] |
---|---|---|
author | Ben Pastene <bpastene@chromium.org> | Fri Nov 20 00:13:14 2020 |
committer | Commit Bot <commit-bot@chromium.org> | Fri Nov 20 00:13:14 2020 |
tree | c5dd4da4edeba7e0b829df8895a2728a07d43926 | |
parent | dfb6327dbc43643ad7dd0cf2710be6b9fb254513 [diff] |
infra: Fix old merge-conflict in cr-buildbucket.cfg after reverts. The order in which crrev.com/c/2550594 and crrev.com/c/2551638 landed conflicted with each other, leading to a stale cr-buildbucket.cfg on trunk. Bug: None Change-Id: I4bc626ed48ce7e159c2365123c645e1696b42196 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550823 Auto-Submit: Ben Pastene <bpastene@chromium.org> Commit-Queue: Haiyang Pan <hypan@google.com> Reviewed-by: Haiyang Pan <hypan@google.com> Cr-Commit-Position: refs/heads/master@{#829440}
Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.
The project's web site is https://www.chromium.org.
Documentation in the source is rooted in docs/README.md.
Learn how to Get Around the Chromium Source Code Directory Structure .
For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.