summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Daly <Nick.M.Daly@gmail.com>2013-04-23 17:49:22 -0500
committerNick Daly <Nick.M.Daly@gmail.com>2013-04-23 17:49:22 -0500
commitf55c7a48ea534e342e6efbd4c7edaf1b1e07f61b (patch)
treefec45d97e4e976ef7ba5dde83f538fcf19092bc0 /.gitignore
parent157226f1b88bc090b677f9896aa62a0c734ebf14 (diff)
Merged with James's upstream.
Hope I did it right. If I screwed up, withsqlite is borked.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 2 insertions, 3 deletions
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