summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-05-30 19:39:58 -0400
committerJason R. Coombs <jaraco@jaraco.com>2017-05-30 19:39:58 -0400
commitfcdf12ee7fdf43c9dded5b68232a0fb3376d4858 (patch)
tree29baaad1490dcce705ccc5f32c6d9d9240e1d10d /.gitignore
parent3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (diff)
parent4dc2c76b62a5071dfacf434555dfa8ec2be0b433 (diff)
downloadpython-setuptools-git-fcdf12ee7fdf43c9dded5b68232a0fb3376d4858.tar.gz
Merge branch 'master' into feature/re-vendor-sadface
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4d77520f..b23ade08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ setuptools.egg-info
*.swp
*~
.hg*
+.cache