1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ihatemoney_ynh.git synced 2024-09-03 19:26:15 +02:00
ihatemoney_ynh/sources/budget/merged_settings.py
Jocelyn Delande 98ea1c8873 Merge remote-tracking branch 'upstream/master'
Conflicts:
	conf/nginx.conf
	sources/budget/run.py
	sources/budget/utils.py
2016-06-17 23:40:38 +02:00

10 lines
153 B
Python

"""
Merges default settings with user-defined settings
"""
from default_settings import *
try:
from settings import *
except ImportError:
pass