aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/models/server/server-config.model.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-12-24 10:40:51 +0100
committerChocobozzz <me@florianbigard.com>2021-12-24 10:40:51 +0100
commitc7cdac440970525d78d257a055899c26f6899a82 (patch)
tree531af934a361aeca81d8f1eacf47036f56eafb1b /shared/models/server/server-config.model.ts
parentd17c7b4e8c52317bdc874917387b7a49f6cf8b01 (diff)
downloadPeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.gz
PeerTube-c7cdac440970525d78d257a055899c26f6899a82.tar.zst
PeerTube-c7cdac440970525d78d257a055899c26f6899a82.zip
Fix type conflict
Diffstat (limited to 'shared/models/server/server-config.model.ts')
-rw-r--r--shared/models/server/server-config.model.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 0e3b4a3d2..8c0e21621 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,5 +1,5 @@
1import { VideoPrivacy } from '../videos/video-privacy.enum' 1import { VideoPrivacy } from '../videos/video-privacy.enum'
2import { ClientScript } from '../plugins/plugin-package-json.model' 2import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
3import { NSFWPolicyType } from '../videos/nsfw-policy.type' 3import { NSFWPolicyType } from '../videos/nsfw-policy.type'
4import { BroadcastMessageLevel } from './broadcast-message-level.type' 4import { BroadcastMessageLevel } from './broadcast-message-level.type'
5 5
@@ -7,7 +7,7 @@ export interface ServerConfigPlugin {
7 name: string 7 name: string
8 version: string 8 version: string
9 description: string 9 description: string
10 clientScripts: { [name: string]: ClientScript } 10 clientScripts: { [name: string]: ClientScriptJSON }
11} 11}
12 12
13export interface ServerConfigTheme extends ServerConfigPlugin { 13export interface ServerConfigTheme extends ServerConfigPlugin {