diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-08-15 13:31:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-15 13:31:04 -0400 |
commit | 336ee28b34816e279fc0bc26d2b5d1e5ea233976 (patch) | |
tree | ca0e50bbd800d991d22b5e22b5cf6a81e9a9b843 /conformance | |
parent | a2484208c3291ea522a891114d2821829bd09083 (diff) | |
parent | f9d93f358d04b73efad49f51f0e879f77eaf4f91 (diff) | |
download | protobuf-336ee28b34816e279fc0bc26d2b5d1e5ea233976.tar.gz protobuf-336ee28b34816e279fc0bc26d2b5d1e5ea233976.tar.bz2 protobuf-336ee28b34816e279fc0bc26d2b5d1e5ea233976.zip |
Merge pull request #1960 from jskeet/oneof
Regenerate conformance files to include extra oneof fields.
Diffstat (limited to 'conformance')
-rw-r--r-- | conformance/failure_list_csharp.txt | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/conformance/failure_list_csharp.txt b/conformance/failure_list_csharp.txt index 6f8a5b7c..1716bcbd 100644 --- a/conformance/failure_list_csharp.txt +++ b/conformance/failure_list_csharp.txt @@ -5,23 +5,3 @@ JsonInput.FieldNameWithMixedCases.JsonOutput JsonInput.FieldNameWithMixedCases.ProtobufOutput JsonInput.FieldNameWithMixedCases.Validator JsonInput.OriginalProtoFieldName.JsonOutput -JsonInput.OneofZeroBool.JsonOutput -JsonInput.OneofZeroBool.ProtobufOutput -JsonInput.OneofZeroDouble.JsonOutput -JsonInput.OneofZeroDouble.ProtobufOutput -JsonInput.OneofZeroEnum.JsonOutput -JsonInput.OneofZeroEnum.ProtobufOutput -JsonInput.OneofZeroFloat.JsonOutput -JsonInput.OneofZeroFloat.ProtobufOutput -JsonInput.OneofZeroUint64.JsonOutput -JsonInput.OneofZeroUint64.ProtobufOutput -ProtobufInput.OneofZeroBool.JsonOutput -ProtobufInput.OneofZeroBool.ProtobufOutput -ProtobufInput.OneofZeroDouble.JsonOutput -ProtobufInput.OneofZeroDouble.ProtobufOutput -ProtobufInput.OneofZeroEnum.JsonOutput -ProtobufInput.OneofZeroEnum.ProtobufOutput -ProtobufInput.OneofZeroFloat.JsonOutput -ProtobufInput.OneofZeroFloat.ProtobufOutput -ProtobufInput.OneofZeroUint64.JsonOutput -ProtobufInput.OneofZeroUint64.ProtobufOutput |