From 82494e4b237a69ffcb47723b31fc2209f67e9192 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sun, 8 Nov 2015 19:39:19 +0000
Subject: [PATCH] Pre-merge

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b68b21f..6cd76bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ static/CACHE/*
 dss/localsettings.py
 dss/storagesettings.py
 dss/celery_settings.py
+dss/devsettings.py
 dss.conf
 dss/debugsettings.py
 mysql