Shared module - merge conflict resolution + removing unused imports so I can check this in.
This commit is contained in:
parent
3b633a5e5b
commit
98fe346e67
|
@ -16,11 +16,6 @@ import {
|
||||||
DialogModule,
|
DialogModule,
|
||||||
FormFieldModule,
|
FormFieldModule,
|
||||||
IconButtonModule,
|
IconButtonModule,
|
||||||
IconModule,
|
|
||||||
MenuModule,
|
|
||||||
NavigationModule,
|
|
||||||
TableModule,
|
|
||||||
TabsModule,
|
|
||||||
} from "@bitwarden/components";
|
} from "@bitwarden/components";
|
||||||
|
|
||||||
// Register the locales for the application
|
// Register the locales for the application
|
||||||
|
@ -53,13 +48,6 @@ import "./locales";
|
||||||
DialogModule,
|
DialogModule,
|
||||||
FormFieldModule,
|
FormFieldModule,
|
||||||
IconButtonModule,
|
IconButtonModule,
|
||||||
IconModule,
|
|
||||||
MenuModule,
|
|
||||||
NavigationModule,
|
|
||||||
TableModule,
|
|
||||||
TabsModule,
|
|
||||||
|
|
||||||
// Web specific
|
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
|
@ -80,13 +68,6 @@ import "./locales";
|
||||||
DialogModule,
|
DialogModule,
|
||||||
FormFieldModule,
|
FormFieldModule,
|
||||||
IconButtonModule,
|
IconButtonModule,
|
||||||
IconModule,
|
|
||||||
MenuModule,
|
|
||||||
NavigationModule,
|
|
||||||
TableModule,
|
|
||||||
TabsModule,
|
|
||||||
|
|
||||||
// Web specific
|
|
||||||
],
|
],
|
||||||
providers: [DatePipe],
|
providers: [DatePipe],
|
||||||
bootstrap: [],
|
bootstrap: [],
|
||||||
|
|
Loading…
Reference in New Issue