summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-05-09 19:45:28 -0400
committerChris McDonough <chrism@plope.com>2013-05-09 19:45:28 -0400
commitdbdfb2fea3851e31e272ebbba4297a138d74e970 (patch)
treee4843670bbf5a681b398a5bfb4bd36fd5a1f22f4 /.gitignore
parent100024533b6bf297228ffccf7230fcaad136edb9 (diff)
parenta0f84bd416be91b7e861d3b5ba8aa7468ad3c4be (diff)
downloadpyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.tar.gz
pyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.tar.bz2
pyramid-dbdfb2fea3851e31e272ebbba4297a138d74e970.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5fa2a2ee4..8dca2069c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
.coverage
.tox/
nosetests.xml
-pyramid/coverage.xml
+coverage.xml
tutorial.db
build/
dist/