Merge pull request #5409 from tonistiigi/fix-merge-vtproto

fix merge conflict in generated proto
moby · Oct 8, 2024 · de2f8b6 · de2f8b6
2 parents 6860c80 + 31f984b
commit de2f8b6
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 54 deletions.
diff --git a/api/services/control/control_vtproto.pb.go b/api/services/control/control_vtproto.pb.go
diff --git a/api/types/worker_vtproto.pb.go b/api/types/worker_vtproto.pb.go