aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-31 09:13:07 -0400
committerGitHub <noreply@github.com>2017-08-31 09:13:07 -0400
commita430e9c176bd78d5deed693b1239dc96c95a1ec2 (patch)
tree0fa858569364bb5818793d97d264aefd365399b5
parent16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff)
parent34355c0e870efce3015fa19aff88c7d79839bbb1 (diff)
downloadgoogletest-a430e9c176bd78d5deed693b1239dc96c95a1ec2.tar.gz
googletest-a430e9c176bd78d5deed693b1239dc96c95a1ec2.tar.bz2
googletest-a430e9c176bd78d5deed693b1239dc96c95a1ec2.zip
Merge pull request #865 from frosteyes/master
Moved the ignoring of *.pyc files to top level
-rw-r--r--.gitignore2
-rw-r--r--googletest/.gitignore2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index da68162d..8f89b801 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ bazel-genfiles
bazel-googletest
bazel-out
bazel-testlogs
+# python
+*.pyc \ No newline at end of file
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