Merge branch 'master' into hethi/fix-faq-example-comment

84bd72ba · Herbert Thielen · GitHub · 14cf7f57 · a430e9c1 · 84bd72ba
Commit 84bd72ba authored Aug 31, 2017 by Herbert Thielen Committed by GitHub Aug 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

.gitignore .gitignore +2 -0

googletest/.gitignore googletest/.gitignore +0 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ bazel-genfiles
 bazel-googletest
 bazel-out
 bazel-testlogs
+# python
+*.pyc
\ No newline at end of file
--- a/googletest/.gitignore
+++ b/googletest/.gitignore
-# python
-*.pyc