fix volume_server.proto conflict (#3858)

Browse source

fix conflict

https://github.com/seaweedfs/seaweedfs/pull/3841

...

This commit is contained in:

Konstantin Lebedev 2022-10-16 08:01:07 +05:00 committed by GitHub

parent 5c2eb602c9

commit f476cf3403

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

1 changed files with 750 additions and 760 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

1510

weed/pb/volume_server_pb/volume_server.pb.go

View file

File diff suppressed because it is too large Load diff