From 38bcce9362d57c51bea08c4c79aa72ec738a3591 Mon Sep 17 00:00:00 2001
From: Aljaz Ceru <aljaz@ceru.si>
Date: Thu, 9 Apr 2020 08:48:02 +0200
Subject: [PATCH] pr conflict resolving

---
 teos/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/teos/__init__.py b/teos/__init__.py
index 4a56111..bdbb1a3 100644
--- a/teos/__init__.py
+++ b/teos/__init__.py
@@ -1,13 +1,13 @@
 import os
 
-HOST = "0.0.0.0"
-PORT = 9814
 DATA_DIR = os.path.expanduser("~/.teos/")
 CONF_FILE_NAME = "teos.conf"
 LOG_PREFIX = "teos"
 
 # Default conf fields
 DEFAULT_CONF = {
+    "API_CONNECT": {"value": "localhost", "type": str},
+    "API_PORT": {"value": 9814, "type": int},
     "BTC_RPC_USER": {"value": "user", "type": str},
     "BTC_RPC_PASSWORD": {"value": "passwd", "type": str},
     "BTC_RPC_CONNECT": {"value": "127.0.0.1", "type": str},
@@ -25,3 +25,4 @@ DEFAULT_CONF = {
     "APPOINTMENTS_DB_PATH": {"value": "appointments", "type": str, "path": True},
     "USERS_DB_PATH": {"value": "users", "type": str, "path": True},
 }
+