From f55c7a48ea534e342e6efbd4c7edaf1b1e07f61b Mon Sep 17 00:00:00 2001
From: Nick Daly <Nick.M.Daly@gmail.com>
Date: Tue, 23 Apr 2013 17:49:22 -0500
Subject: Merged with James's upstream.

Hope I did it right.  If I screwed up, withsqlite is borked.
---
 .gitignore | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index d5be685..e5bdabe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,9 +20,8 @@ templates/*.py
 TODO
 \#*
 .#*
-cfg.py
-cherrypy.config
+*~
 data/users.sqlite3
 predepend
 build/
-*.pid
\ No newline at end of file
+*.pid
-- 
cgit v1.2.3