summaryrefslogtreecommitdiff
path: root/src/server/api/streaming.ts
diff options
context:
space:
mode:
authorAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
committerAkihiko Odaki <nekomanma@pixiv.co.jp>2018-04-02 13:15:53 +0900
commit3fb6834f7d06d52163102b69afe353f8c65ee003 (patch)
tree2d44fc013296310c1a9baed62f45f89ec1fd179d /src/server/api/streaming.ts
parentAbolish common and misc directories (diff)
downloadsharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.gz
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.tar.bz2
sharkey-3fb6834f7d06d52163102b69afe353f8c65ee003.zip
Introduce config module
Diffstat (limited to 'src/server/api/streaming.ts')
-rw-r--r--src/server/api/streaming.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/api/streaming.ts b/src/server/api/streaming.ts
index c86c6a8b4a..edcf505d24 100644
--- a/src/server/api/streaming.ts
+++ b/src/server/api/streaming.ts
@@ -1,7 +1,7 @@
import * as http from 'http';
import * as websocket from 'websocket';
import * as redis from 'redis';
-import config from '../../conf';
+import config from '../../config';
import { default as User, IUser } from '../../models/user';
import AccessToken from '../../models/access-token';
import isNativeToken from './common/is-native-token';