<@U41NT8LUW> When merging your branch <https://git...
# kroto-plus
r
@marcoferrer When merging your branch https://github.com/marcoferrer/kroto-plus/tree/kotlin-serialization-prototype (PR #13) there's a conflict between gprcRoutines and mp protobuf messages. Should I preserve both?
Copy code
// Configuration entries for the 'Grpc Coroutines' code generator.
    repeated GrpcCoroutinesGenOptions grpc_coroutines = 26;
...
    // Configuration entries for the 'Multi-Platform Protobuf Messages' code generator.
    repeated MPProtobufMessagesGenOptions mp_protobuf_messages = 26;
Or are these different names for the same thing?