Skip to content

Commit 31f984b

Browse files
tonistiigitonistiigi
committed
fix merge conflict in generated proto
Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 6860c80 commit 31f984b

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)