diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2017-03-29 09:44:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 09:44:59 -0400 |
| commit | 04c77c4e4b7a26e3ae8e555bb58c4bc5a1f1071a (patch) | |
| tree | 3cf0a9193d0540d09d8d34ffeadd62d5a6624965 | |
| parent | d43eaf2b8fe40c57eaf5e31d0ae7dfa9f1c2f68b (diff) | |
| parent | 8adf57e0faba6966e90a99adeb44bbe95f0f8c44 (diff) | |
| download | protobuf-04c77c4e4b7a26e3ae8e555bb58c4bc5a1f1071a.tar.gz protobuf-04c77c4e4b7a26e3ae8e555bb58c4bc5a1f1071a.tar.bz2 protobuf-04c77c4e4b7a26e3ae8e555bb58c4bc5a1f1071a.zip | |
Merge pull request #2913 from thomasvl/conformance_ignores
Add some new ignores for things generated in conformance.
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -113,9 +113,11 @@ conformance/conformance.pb.cc conformance/conformance.pb.h conformance/Conformance.pbobjc.h conformance/Conformance.pbobjc.m +conformance/conformance_pb.js conformance/conformance_pb.rb conformance/failing_tests.txt conformance/google/ +conformance/google-protobuf/ conformance/javac_middleman conformance/lite/ conformance/nonexistent_tests.txt |