diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-17 16:40:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 16:40:11 -0500 |
| commit | b59c30f729401214131dd1378a49efa80f134717 (patch) | |
| tree | b7489a86f318bb251b32910e3ea65c71eec5ceb6 /vendor/google.golang.org/protobuf/internal/impl/merge_gen.go | |
| parent | d7492f1514674825a63c89ae635e57f535800c8d (diff) | |
| parent | 860463d97eb3a006f2c608165d9e657be86080ec (diff) | |
| download | podman-b59c30f729401214131dd1378a49efa80f134717.tar.gz podman-b59c30f729401214131dd1378a49efa80f134717.tar.bz2 podman-b59c30f729401214131dd1378a49efa80f134717.zip | |
Merge pull request #12893 from cevich/tmp_dis_osx
[CI:DOCS] Cirrus: Temporarily disable OSX Cross task
Diffstat (limited to 'vendor/google.golang.org/protobuf/internal/impl/merge_gen.go')
0 files changed, 0 insertions, 0 deletions
