From f367642103160b357cce6e59256cd3a51c9bad28 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Fri, 6 May 2016 11:44:42 -0400
Subject: Add two missing ignores for conformance directory.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index a2d6ca9c..27eeb9c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,5 +111,7 @@ conformance/conformance.pb.h
 conformance/Conformance.pbobjc.h
 conformance/Conformance.pbobjc.m
 conformance/conformance.rb
+conformance/google/
 conformance/javac_middleman
+conformance/lite/
 conformance/protoc_middleman
-- 
cgit v1.2.3