fix conflicts

This commit is contained in:
Konstantin Lebedev
2022-08-01 14:47:00 +05:00
parent 3c75479e2b
commit 634bc97840
4 changed files with 869 additions and 859 deletions

View File

@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.26.0
// protoc v3.17.3
// protoc-gen-go v1.28.0
// protoc v3.21.4
// source: mq.proto
package mq_pb