Skip to content

Commit de2f8b6

Browse files
authored
Merge pull request moby#5409 from tonistiigi/fix-merge-vtproto
fix merge conflict in generated proto
2 parents 6860c80 + 31f984b commit de2f8b6

File tree

2 files changed

+54
-54
lines changed

2 files changed

+54
-54
lines changed

api/services/control/control_vtproto.pb.go

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/types/worker_vtproto.pb.go

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)