Merged in flub/pytest (pull request #299)

Ignore emacs' .dir-locals.el file
2015-06-03 23:34:13 +02:00 · 2015-06-03 23:34:13 +02:00 · 22c62dbd90
parent d220be8468 773b8b69dd
commit 22c62dbd90
1 changed files with 1 additions and 0 deletions
--- a/.hgignore
+++ b/.hgignore
@ -37,3 +37,4 @@ env3/
 .coverage
 .ropeproject
 *.sublime-*
+.dir-locals.el