From 759245a49a00315a41b28da8fe52a2894d4f57ea Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Tue, 25 Jul 2017 11:52:33 -0700 Subject: Merge from master --- conformance/failure_list_csharp.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'conformance/failure_list_csharp.txt') diff --git a/conformance/failure_list_csharp.txt b/conformance/failure_list_csharp.txt index d70c3b69..55e63922 100644 --- a/conformance/failure_list_csharp.txt +++ b/conformance/failure_list_csharp.txt @@ -1,6 +1,5 @@ -Recommended.JsonInput.BytesFieldBase64Url.JsonOutput -Recommended.JsonInput.BytesFieldBase64Url.ProtobufOutput -Required.ProtobufInput.IllegalZeroFieldNum_Case_0 -Required.ProtobufInput.IllegalZeroFieldNum_Case_1 -Required.ProtobufInput.IllegalZeroFieldNum_Case_2 -Required.ProtobufInput.IllegalZeroFieldNum_Case_3 +Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_0 +Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_1 +Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_2 +Required.Proto3.ProtobufInput.IllegalZeroFieldNum_Case_3 + -- cgit v1.2.3