From 84abb902e78344cfbfe15494d728056e9e9c2030 Mon Sep 17 00:00:00 2001
From: Florian N <michael@hostechs.com>
Date: Wed, 12 Feb 2014 18:36:02 -0500
Subject: [PATCH] merge

---
 pydash/settings.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pydash/settings.py b/pydash/settings.py
index b1d66aa..51a6bd1 100644
--- a/pydash/settings.py
+++ b/pydash/settings.py
@@ -136,3 +136,8 @@ LOGGING = {
         },
     }
 }
+
+try:
+    from local_settings import *
+except ImportError:
+    pass