aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-05-28 16:07:57 +0100
committerMatthew Somerville <matthew@mysociety.org>2012-05-28 16:07:57 +0100
commit959012b397c40638eaa62cd911f416f605043330 (patch)
tree6fcfd0325d02f89c12a83ceaea39966dfa3b454d /.gitignore
parentc86fb4cfa6fdf62c5d0ba968b6fda7eb46c3d027 (diff)
parent2e94d363be99e83a24ed7b14c6dd00480b9afc93 (diff)
Merge branch 'bromley'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 055e181dd..974d01d6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.ttc
/cities_bin
/private_locale
+*~
._*
.DS_Store
.carton