resolved merge conflicts w/ burnettk

This commit is contained in:
jasquat 2023-02-22 13:55:45 -05:00
commit 81f1bb965b
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,5 @@
from os import environ
CONNECTOR_PROXY_WAKU_BASE_URL = environ.get("CONNECTOR_PROXY_WAKU_BASE_URL", default="http://localhost:8545")
CONNECTOR_PROXY_XERO_CLIENT_ID = environ.get("CONNECTOR_PROXY_XERO_CLIENT_ID")
CONNECTOR_PROXY_XERO_CLIENT_SECRET = environ.get("CONNECTOR_PROXY_XERO_CLIENT_SECRET")
@ -10,3 +8,5 @@ CONNECTOR_PROXY_POSTGRESQL_USER_NAME = environ.get("CONNECTOR_PROXY_POSTGRESQL_U
CONNECTOR_PROXY_POSTGRESQL_HOST = environ.get("CONNECTOR_PROXY_POSTGRESQL_HOST", default="localhost")
CONNECTOR_PROXY_POSTGRESQL_PORT = environ.get("CONNECTOR_PROXY_POSTGRESQL_PORT", default="7005")
CONNECTOR_PROXY_POSTGRESQL_PASSWORD = environ.get("CONNECTOR_PROXY_POSTGRESQL_PASSWORD")
SECRET_KEY = environ.get("FLASK_SESSION_SECRET_KEY", default="super-secret-key-for-flask")

2
poetry.lock generated
View File

@ -1002,7 +1002,7 @@ Flask-OAuthlib = "^0.9.6"
type = "git"
url = "https://github.com/sartography/spiffworkflow-proxy"
reference = "HEAD"
resolved_reference = "6cb2bbea923946cb2db3bf571a4ce28c776434b9"
resolved_reference = "4cdbd3b37a15a49fbb043528ff3f9aeee9784b2f"
[[package]]
name = "stevedore"