From 53b112d407e283304afeb3a5cd5bdf43cff000db Mon Sep 17 00:00:00 2001 From: nothink Date: Wed, 1 Aug 2018 13:50:12 +0900 Subject: [PATCH] typo... --- .travis.yml | 7 ------- server/szurubooru/config.py | 1 - 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c48da6b..044958a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ services: matrix: include: - language: python - # Backend test for on-premise / python 3.6 python: - "3.6" allow_failures: @@ -42,7 +41,6 @@ matrix: - py.test - language: python - # Backend test for on-premise / python 3.7-dev python: - "3.7-dev" allow_failures: @@ -75,7 +73,6 @@ matrix: - py.test - language: node_js - # Frontend test ugins npm / nodejs 6 node_js: name: "Frontend test ugins npm / nodejs 6" - "6" @@ -86,7 +83,6 @@ matrix: - node build.js - language: node_js - # Frontend test ugins npm / nodejs 7 node_js: name: "Frontend test ugins npm / nodejs 7" - "7" @@ -97,7 +93,6 @@ matrix: - node build.js - language: node_js - # Frontend test ugins npm / nodejs 8 node_js: name: "Frontend test ugins npm / nodejs 8" - "8" @@ -108,7 +103,6 @@ matrix: - node build.js - language: node_js - # Frontend test ugins npm / nodejs 9 node_js: name: "Frontend test ugins npm / nodejs 9" - "9" @@ -119,7 +113,6 @@ matrix: - node build.js - language: node_js - # Frontend test ugins yarn / nodejs 9 node_js: - "9" name: "Frontend test ugins yarn / nodejs 9" diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py index a8f87921..3ddbea53 100644 --- a/server/szurubooru/config.py +++ b/server/szurubooru/config.py @@ -53,7 +53,6 @@ def read_config() -> Dict: ret = merge(ret, yaml.load(handle.read())) if os.path.exists('/.dockerenv'): ret = merge(ret, docker_config()) - return ret