|
|
@ -178,13 +178,17 @@ export interface FormStateProps { |
|
|
|
url: string |
|
|
|
url: string |
|
|
|
type: 'iframe' | 'ws' |
|
|
|
type: 'iframe' | 'ws' |
|
|
|
hash: string |
|
|
|
hash: string |
|
|
|
methods: any |
|
|
|
methods: string[] |
|
|
|
location: string |
|
|
|
location: string |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
canActivate?: any |
|
|
|
canActivate?: any |
|
|
|
======= |
|
|
|
======= |
|
|
|
canActivate: any |
|
|
|
canActivate: any |
|
|
|
>>>>>>> ceb5496f4 (fix whitespaces and canactivate) |
|
|
|
>>>>>>> ceb5496f4 (fix whitespaces and canactivate) |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
canActivate: string[] |
|
|
|
|
|
|
|
>>>>>>> cb86d9b5a (Update types.d.ts) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
export type PluginManagerProfile = Profile & { |
|
|
|
export type PluginManagerProfile = Profile & { |
|
|
|