summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
committerPaul Everitt <paul@agendaless.com>2013-07-07 08:47:56 -0400
commitd44d0e044555cd1287680fc8368632a64ebe979b (patch)
tree8a70d4025a8ee19b82e2a915bc668130b405cf93 /.gitignore
parent47eaa189e115936a86357380accd8d472e4d9a6c (diff)
parentd59440878b67b65e57c91c7b4aa8e7cbf943a729 (diff)
downloadpyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.gz
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.tar.bz2
pyramid-d44d0e044555cd1287680fc8368632a64ebe979b.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/