diff options
Diffstat (limited to 'proto/go/gitalypb/conflicts.pb.go')
-rw-r--r-- | proto/go/gitalypb/conflicts.pb.go | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go index a2373a0bb..78c8495a2 100644 --- a/proto/go/gitalypb/conflicts.pb.go +++ b/proto/go/gitalypb/conflicts.pb.go @@ -488,47 +488,46 @@ func init() { func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) } var fileDescriptor_28fc8937e7d75862 = []byte{ - // 625 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4d, 0x4f, 0xdb, 0x40, - 0x10, 0x65, 0xf3, 0x9d, 0xc1, 0x40, 0x58, 0xb5, 0xc2, 0x44, 0x42, 0x18, 0x53, 0x24, 0xb7, 0x52, - 0x13, 0x48, 0x7b, 0x47, 0x0a, 0xa2, 0x45, 0xa8, 0xa8, 0x95, 0xab, 0x5e, 0x7a, 0xb1, 0x1c, 0x7b, - 0x48, 0x5c, 0x39, 0xde, 0x74, 0x77, 0x8d, 0x94, 0x3f, 0xd1, 0x2b, 0xb7, 0xaa, 0xff, 0xac, 0x3f, - 0xa3, 0x12, 0xa7, 0x2a, 0xbb, 0xb6, 0x09, 0x24, 0xa1, 0xa7, 0xde, 0x92, 0x37, 0xcf, 0x6f, 0xde, - 0xcc, 0x3c, 0x2d, 0x6c, 0x05, 0x2c, 0xb9, 0x8e, 0xa3, 0x40, 0x8a, 0xce, 0x84, 0x33, 0xc9, 0x68, - 0x6d, 0x18, 0x49, 0x3f, 0x9e, 0xb6, 0x0d, 0x31, 0xf2, 0x39, 0x86, 0x1a, 0xb5, 0x7f, 0x12, 0x30, - 0x3f, 0x44, 0x42, 0x9e, 0x65, 0xec, 0x77, 0x51, 0x8c, 0xc2, 0xc5, 0xef, 0x29, 0x0a, 0x49, 0x7b, - 0x00, 0x1c, 0x27, 0x4c, 0x44, 0x92, 0xf1, 0xa9, 0x49, 0x2c, 0xe2, 0xac, 0xf7, 0x68, 0x47, 0xeb, - 0x74, 0xdc, 0xa2, 0xe2, 0xce, 0xb1, 0xe8, 0x0b, 0xd8, 0x64, 0x29, 0xf7, 0x02, 0x36, 0x1e, 0x47, - 0xd2, 0x63, 0x51, 0x68, 0x96, 0x2c, 0xe2, 0x34, 0x5d, 0x83, 0xa5, 0xfc, 0x4c, 0x81, 0x1f, 0xa3, - 0x90, 0x3a, 0xd0, 0x92, 0x23, 0x8c, 0x1e, 0xf0, 0xca, 0x8a, 0xb7, 0xa9, 0xf0, 0x82, 0x69, 0xff, - 0x20, 0x40, 0xe7, 0xcd, 0x5d, 0xa0, 0x1f, 0x22, 0xa7, 0x7b, 0x00, 0x0b, 0x2d, 0x9a, 0x41, 0xa1, - 0xbf, 0x07, 0xa0, 0xf5, 0x27, 0xbe, 0x1c, 0x29, 0x65, 0xc3, 0x6d, 0x2a, 0xe4, 0x93, 0x2f, 0x47, - 0x74, 0x17, 0x1a, 0x33, 0x93, 0xaa, 0x58, 0x51, 0xc5, 0x3a, 0x4b, 0x1f, 0x94, 0xc6, 0x2c, 0x44, - 0xb3, 0x6a, 0x11, 0xa7, 0xaa, 0x4a, 0x57, 0x2c, 0xc4, 0xcb, 0x4a, 0x83, 0xb4, 0x4a, 0xf6, 0x14, - 0x8c, 0x79, 0x3f, 0xf4, 0x2d, 0xd4, 0x46, 0xca, 0x53, 0xb6, 0xa0, 0x76, 0xbe, 0xa0, 0x45, 0xd7, - 0x17, 0x6b, 0x6e, 0xc6, 0xa5, 0x6d, 0xa8, 0x07, 0x2c, 0x91, 0x98, 0x48, 0x65, 0xde, 0xb8, 0x58, - 0x73, 0x73, 0xa0, 0xbf, 0x03, 0xcf, 0xf3, 0xe3, 0x79, 0xd7, 0x51, 0x8c, 0xde, 0xc4, 0x9f, 0xc6, - 0xcc, 0x0f, 0xed, 0xf7, 0xb0, 0xbb, 0xe4, 0x56, 0x62, 0xc2, 0x12, 0x81, 0xf4, 0x15, 0x54, 0x67, - 0x64, 0x61, 0x12, 0xab, 0xec, 0xac, 0xf7, 0x9e, 0x2d, 0xb3, 0xe1, 0x6a, 0x8a, 0xfd, 0xa7, 0x04, - 0x7b, 0x2e, 0x0a, 0x16, 0xdf, 0x60, 0x5e, 0xce, 0x8f, 0x9e, 0xed, 0xf7, 0xff, 0x9d, 0xfe, 0x14, - 0xb6, 0xa5, 0xcf, 0x87, 0x28, 0xbd, 0xb9, 0x06, 0xe5, 0x95, 0x0d, 0x5a, 0x9a, 0x7c, 0x8f, 0x2c, - 0xcd, 0x4e, 0x65, 0x59, 0x76, 0xe8, 0x21, 0x6c, 0x08, 0x96, 0xf2, 0x00, 0xbd, 0x01, 0xf7, 0x93, - 0x60, 0xa4, 0x0e, 0x6a, 0xb8, 0x86, 0x06, 0xfb, 0x0a, 0x9b, 0x91, 0x32, 0x3f, 0x19, 0xa9, 0xa6, - 0x49, 0x1a, 0xcc, 0x48, 0x47, 0xb0, 0x99, 0x75, 0x1b, 0xa3, 0x10, 0xfe, 0x10, 0xcd, 0xba, 0x62, - 0x6d, 0x68, 0xf4, 0x4a, 0x83, 0xd4, 0x82, 0x4a, 0x2a, 0x90, 0x9b, 0x0d, 0x35, 0x8e, 0x91, 0x8f, - 0xf3, 0x45, 0x20, 0x77, 0x55, 0xc5, 0xfe, 0x45, 0x60, 0x67, 0xc5, 0xe6, 0xe9, 0xe9, 0xa3, 0x24, - 0x1d, 0xdd, 0xaf, 0xe3, 0x89, 0x53, 0xcd, 0x85, 0x6a, 0x1f, 0x40, 0xdd, 0xd7, 0xfb, 0x26, 0x58, - 0x52, 0xe4, 0xaa, 0xa9, 0xb0, 0x4b, 0xc1, 0x92, 0xfe, 0x21, 0x1c, 0x70, 0xad, 0xe5, 0x15, 0xcf, - 0x83, 0xc7, 0xb5, 0x5a, 0x91, 0xb2, 0x73, 0x30, 0x17, 0x1b, 0x66, 0x21, 0x7b, 0x09, 0x2d, 0x25, - 0x90, 0xca, 0x88, 0x25, 0x1e, 0x72, 0xce, 0xb4, 0xd9, 0xa6, 0xbb, 0x75, 0x8f, 0x9f, 0xcf, 0xe0, - 0xde, 0x6f, 0x02, 0xad, 0x42, 0xe0, 0x33, 0xf2, 0x9b, 0x28, 0x40, 0x8a, 0xb0, 0xbd, 0x90, 0x60, - 0x6a, 0xe5, 0x73, 0xae, 0x7a, 0x88, 0xda, 0x07, 0x4f, 0x30, 0xb4, 0x33, 0xbb, 0x79, 0x77, 0xeb, - 0x54, 0x1b, 0xa5, 0x36, 0x39, 0x39, 0x26, 0x34, 0x84, 0xd6, 0xe3, 0x11, 0xe8, 0xfe, 0x3f, 0xb6, - 0xd9, 0xb6, 0x56, 0x13, 0xb2, 0x1e, 0xeb, 0x77, 0xb7, 0x4e, 0xbd, 0x41, 0xda, 0xe5, 0x93, 0xce, - 0x89, 0x43, 0xfa, 0xc7, 0x5f, 0x67, 0x5f, 0xc4, 0xfe, 0xa0, 0x13, 0xb0, 0x71, 0x57, 0xff, 0x7c, - 0xcd, 0xf8, 0xb0, 0xab, 0x75, 0xba, 0xea, 0x85, 0xed, 0x0e, 0x59, 0xf6, 0x7f, 0x32, 0x18, 0xd4, - 0x14, 0xf4, 0xe6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0xab, 0xf8, 0x46, 0x9d, 0x05, 0x00, - 0x00, + // 624 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x86, 0xbb, 0x69, 0x9a, 0x26, 0x53, 0xb7, 0x4d, 0x57, 0xa0, 0xba, 0x91, 0xaa, 0xba, 0x2e, + 0x95, 0x0c, 0x82, 0xa4, 0x2a, 0x1c, 0xb8, 0x55, 0x4a, 0x55, 0xa8, 0x2a, 0x2a, 0xd0, 0x22, 0x2e, + 0x5c, 0x2c, 0xc7, 0xde, 0x26, 0x46, 0x8e, 0x27, 0xec, 0xae, 0x2b, 0xe5, 0x25, 0xb8, 0xc2, 0x91, + 0x03, 0xcf, 0xc2, 0x2b, 0xf0, 0x2e, 0x48, 0x48, 0x28, 0xbb, 0xb6, 0x9b, 0x36, 0x49, 0x39, 0x71, + 0x4b, 0xfe, 0xf9, 0x34, 0xf3, 0x7b, 0xe6, 0xd7, 0xc2, 0x66, 0x88, 0xe9, 0x55, 0x12, 0x87, 0x4a, + 0xb6, 0x47, 0x02, 0x15, 0xd2, 0x5a, 0x3f, 0x56, 0x41, 0x32, 0x6e, 0x59, 0x72, 0x10, 0x08, 0x1e, + 0x19, 0xd5, 0xfd, 0x41, 0xc0, 0x7e, 0x13, 0x4b, 0x75, 0x9a, 0xd3, 0xaf, 0xe2, 0x84, 0x4b, 0xc6, + 0x3f, 0x67, 0x5c, 0x2a, 0xfa, 0x12, 0x40, 0xf0, 0x11, 0xca, 0x58, 0xa1, 0x18, 0xdb, 0xc4, 0x21, + 0xde, 0xda, 0x31, 0x6d, 0x9b, 0x3e, 0x6d, 0x56, 0x56, 0xba, 0xd5, 0x6f, 0x3f, 0x9f, 0x12, 0x36, + 0xc5, 0xd2, 0x47, 0xb0, 0x81, 0x99, 0xf0, 0x43, 0x1c, 0x0e, 0x63, 0xe5, 0x63, 0x1c, 0xd9, 0x15, + 0x87, 0x78, 0x0d, 0x66, 0x61, 0x26, 0x4e, 0xb5, 0xf8, 0x36, 0x8e, 0xa8, 0x07, 0x4d, 0x35, 0xe0, + 0xf1, 0x2d, 0x6e, 0x59, 0x73, 0x1b, 0x5a, 0x2f, 0x49, 0xf7, 0x0b, 0x01, 0x3a, 0x6d, 0xf1, 0x9c, + 0x07, 0x11, 0x17, 0x74, 0x17, 0x60, 0x66, 0x44, 0x23, 0x2c, 0xfb, 0xef, 0x02, 0x98, 0xfe, 0xa3, + 0x40, 0x0d, 0x74, 0x67, 0x8b, 0x35, 0xb4, 0xf2, 0x2e, 0x50, 0x03, 0xba, 0x03, 0xf5, 0x89, 0x49, + 0x5d, 0xac, 0xea, 0xe2, 0x2a, 0x66, 0xb7, 0x4a, 0x43, 0x8c, 0xb8, 0xbd, 0xe2, 0x10, 0x6f, 0x45, + 0x97, 0x2e, 0x31, 0xe2, 0x17, 0xd5, 0x3a, 0x69, 0x56, 0xdc, 0x31, 0x58, 0xd3, 0x7e, 0xe8, 0x0b, + 0xa8, 0x0d, 0xb4, 0xa7, 0x7c, 0x4d, 0xad, 0x62, 0x4d, 0xb3, 0xae, 0xcf, 0x97, 0x58, 0xce, 0xd2, + 0x16, 0xac, 0x86, 0x98, 0x2a, 0x9e, 0x2a, 0x6d, 0xde, 0x3a, 0x5f, 0x62, 0x85, 0xd0, 0xdd, 0x86, + 0x87, 0xc5, 0x09, 0xfd, 0xab, 0x38, 0xe1, 0xfe, 0x28, 0x18, 0x27, 0x18, 0x44, 0xee, 0x6b, 0xd8, + 0x99, 0x73, 0x31, 0x39, 0xc2, 0x54, 0x72, 0xfa, 0x04, 0x56, 0x26, 0xb0, 0xb4, 0x89, 0xb3, 0xec, + 0xad, 0x1d, 0x3f, 0x98, 0x67, 0x83, 0x19, 0xc4, 0xfd, 0x53, 0x81, 0x5d, 0xc6, 0x25, 0x26, 0xd7, + 0xbc, 0x28, 0x17, 0xa7, 0xcf, 0xf7, 0xfb, 0xbf, 0x03, 0x70, 0x02, 0x5b, 0x2a, 0x10, 0x7d, 0xae, + 0xfc, 0xa9, 0x31, 0xcb, 0x8b, 0xc6, 0xb0, 0xa6, 0x81, 0x6f, 0x94, 0xb9, 0x09, 0xaa, 0xce, 0x4b, + 0x10, 0x3d, 0x80, 0x75, 0x89, 0x99, 0x08, 0xb9, 0xdf, 0x13, 0x41, 0x1a, 0x0e, 0xf4, 0x59, 0x2d, + 0x66, 0x19, 0xb1, 0xab, 0xb5, 0x09, 0x94, 0xfb, 0xc9, 0xa1, 0x9a, 0x81, 0x8c, 0x98, 0x43, 0x87, + 0xb0, 0x91, 0x4f, 0x1b, 0x72, 0x29, 0x83, 0x3e, 0xb7, 0x57, 0x35, 0xb5, 0x6e, 0xd4, 0x4b, 0x23, + 0x52, 0x07, 0xaa, 0x99, 0xe4, 0xc2, 0xae, 0xeb, 0xcf, 0xb1, 0x8a, 0xcf, 0xf9, 0x20, 0xb9, 0x60, + 0xba, 0xe2, 0x7e, 0x27, 0xb0, 0xbd, 0x60, 0xff, 0xf4, 0xe4, 0x4e, 0x9e, 0x0e, 0x6f, 0xd6, 0x71, + 0xcf, 0xc1, 0xa6, 0xa2, 0xb5, 0x07, 0xa0, 0xaf, 0xec, 0x7f, 0x92, 0x98, 0x96, 0xe9, 0x6a, 0x68, + 0xed, 0x42, 0x62, 0xda, 0x3d, 0x80, 0x7d, 0x61, 0x7a, 0xf9, 0xe5, 0x53, 0xe1, 0x0b, 0xd3, 0xad, + 0xcc, 0xda, 0x19, 0xd8, 0xb3, 0x03, 0xf3, 0xa8, 0x3d, 0x86, 0xa6, 0x6e, 0x90, 0xa9, 0x18, 0x53, + 0x9f, 0x0b, 0x81, 0xc6, 0x6c, 0x83, 0x6d, 0xde, 0xe8, 0x67, 0x13, 0xf9, 0xf8, 0x17, 0x81, 0x66, + 0xd9, 0xe0, 0x3d, 0x17, 0xd7, 0x71, 0xc8, 0x69, 0x0f, 0xb6, 0x66, 0x72, 0x4c, 0x9d, 0xe2, 0x3b, + 0x17, 0x3d, 0x4a, 0xad, 0xfd, 0x7b, 0x08, 0xe3, 0xcc, 0xad, 0xfd, 0xfe, 0xea, 0x55, 0xea, 0x95, + 0x23, 0x42, 0x7d, 0x68, 0xde, 0xf5, 0x4f, 0xf7, 0xfe, 0xb1, 0xca, 0x96, 0xb3, 0x18, 0xb8, 0x35, + 0x80, 0x78, 0xa4, 0x7b, 0xf4, 0x71, 0x02, 0x27, 0x41, 0xaf, 0x1d, 0xe2, 0xb0, 0x63, 0x7e, 0x3e, + 0x43, 0xd1, 0xef, 0x98, 0x16, 0x1d, 0xfd, 0xca, 0x76, 0xfa, 0x98, 0xff, 0x1f, 0xf5, 0x7a, 0x35, + 0x2d, 0x3d, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x02, 0x6b, 0xd6, 0x00, 0xa1, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. |