diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index ff36bb1be16529f0d57401704d37fbc4859413be..e0493710d23549971b467195a45be61f379a5e5a 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -264,6 +264,9 @@ NOSE_ARGS = [ # Production settings have their own file to override stuff here try: - from local_settings import * -except ImportError: - pass + LOCAL_SETTINGS +except NameError: + try: + from local_settings import * + except ImportError: + pass \ No newline at end of file