resolve minor merge conflict with master

master
Jonathan Warren 9 years ago
commit b6e0396333

@ -174,6 +174,7 @@ class Main:
curses = True
signal.signal(signal.SIGINT, helper_generic.signal_handler)
signal.signal(signal.SIGTERM, helper_generic.signal_handler)
# signal.signal(signal.SIGINT, signal.SIG_DFL)
helper_bootstrap.knownNodes()

@ -18,7 +18,7 @@ language = DEFAULT_LANGUAGE
try:
import locale
encoding = locale.getpreferredencoding(False) or DEFAULT_ENCODING
encoding = locale.getpreferredencoding(True) or DEFAULT_ENCODING
language = locale.getlocale()[0] or locale.getdefaultlocale()[0] or DEFAULT_LANGUAGE
except:
logger.exception('Could not determine language or encoding')

Loading…
Cancel
Save