fix whitespaces and canactivate

3 years ago · 25e677de8f
parent 6cdd9aca91
commit 25e677de8f
1 changed files with 4 additions and 0 deletions
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@ -180,7 +180,11 @@ export interface FormStateProps {
  hash: string
  methods: any
  location: string
+<<<<<<< HEAD
  canActivate?: any
+=======
+  canActivate: any
+>>>>>>> ceb5496f4 (fix whitespaces and canactivate)
 }

 export type PluginManagerProfile = Profile & {