Merge branch 'master' of gitlab.com:openlp/openlp_api_tester

# Conflicts:
#	test_api/apitest/runner.py
This commit is contained in:
Tim 2020-06-26 15:22:09 +01:00
parent 81a1f87366
commit 1f07728b86
No known key found for this signature in database
GPG Key ID: 3D454289AF831A6D
1 changed files with 2 additions and 3 deletions

View File

@ -26,11 +26,10 @@ import yaml
from collections import deque
from websocket import create_connection
from test_api.apitest.logger import print_text, print_error, print_ok, print_info
# from test_api.apitest.logger import print_debug
from test_api.apitest.callbacks import * # noqa E403
from test_api.apitest.logger import print_error, print_ok, print_info
# from test_api.apitest.logger import print_debug
from test_api.apitest.task import Task