From: Daira Hopwood <daira@jacaranda.org>
Date: Wed, 4 Nov 2015 14:13:31 +0000 (+0000)
Subject: .gitignore: add /smoke_magicfolder/, delete obsolete stuff.
X-Git-Url: https://git.rkrishnan.org/simplejson/frontends?a=commitdiff_plain;h=c6a461ec149ead0d5d809e300f6dbe081ef6525a;p=tahoe-lafs%2Ftahoe-lafs.git

.gitignore: add /smoke_magicfolder/, delete obsolete stuff.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/.gitignore b/.gitignore
index ee1a24cf..42dc42df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ zope.interface-*.egg
 /tmp*
 /*.patch
 /dist/
-/twisted/plugins/dropin.cache
 /tahoe-deps/
 /tahoe-deps.tar.gz
 /.coverage
@@ -34,3 +33,4 @@ zope.interface-*.egg
 /coverage-html/
 /miscaptures.txt
 /violations.txt
+/smoke_magicfolder/