aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorThomas Van Lenten <thomasvl@google.com>2017-03-28 11:04:58 -0400
committerThomas Van Lenten <thomasvl@google.com>2017-03-28 11:04:58 -0400
commit8adf57e0faba6966e90a99adeb44bbe95f0f8c44 (patch)
tree30c245efcc2e36da5d4cd0486d02b52d1a268aea /.gitignore
parentb3f3e123aade1550f3d862d742ab26192cd3b786 (diff)
downloadprotobuf-8adf57e0faba6966e90a99adeb44bbe95f0f8c44.tar.gz
protobuf-8adf57e0faba6966e90a99adeb44bbe95f0f8c44.tar.bz2
protobuf-8adf57e0faba6966e90a99adeb44bbe95f0f8c44.zip
Add some new ignores for things generated in conformance.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9e10c141..43965a1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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