aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaus Stovgaard <claus.stovgaard@gmail.com>2016-08-30 16:15:46 +0200
committerClaus Stovgaard <claus.stovgaard@gmail.com>2016-08-30 16:15:46 +0200
commit68f19facc26aba2e1d3e73978b7daf9b0bfa3970 (patch)
tree15f375736b7263e276762ba8ef451e4f856707c4
parented9d1e1ff92ce199de5ca2667a667cd0a368482a (diff)
downloadgoogletest-68f19facc26aba2e1d3e73978b7daf9b0bfa3970.tar.gz
googletest-68f19facc26aba2e1d3e73978b7daf9b0bfa3970.tar.bz2
googletest-68f19facc26aba2e1d3e73978b7daf9b0bfa3970.zip
Moved the ignoring of *.pyc files to top level for also covering googlemock python scripts.
-rw-r--r--.gitignore2
-rw-r--r--googletest/.gitignore2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index ce310bc3..1da12d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
# Ignore CI build directory
build/
+# python
+*.pyc
diff --git a/googletest/.gitignore b/googletest/.gitignore
deleted file mode 100644
index 4b7be4b9..00000000
--- a/googletest/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# python
-*.pyc