aboutsummaryrefslogtreecommitdiff
path: root/budget/merged_settings.py
diff options
context:
space:
mode:
Diffstat (limited to 'budget/merged_settings.py')
-rw-r--r--budget/merged_settings.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/budget/merged_settings.py b/budget/merged_settings.py
deleted file mode 100644
index f6b1f81..0000000
--- a/budget/merged_settings.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-Merges default settings with user-defined settings
-"""
-
-from default_settings import *
-
-try:
- from settings import *
-except ImportError:
- pass