merge(09-01): resolve app.module.ts conflict (CertManagerModule + FavoritesModule)
This commit is contained in:
@@ -12,6 +12,7 @@ import { MailModule } from './mail/mail.module';
|
||||
import { CalendarModule } from './calendar/calendar.module';
|
||||
import { DashboardModule } from './dashboard/dashboard.module';
|
||||
import { DkvModule } from './dkv/dkv.module';
|
||||
import { CertManagerModule } from './cert-manager/cert-manager.module';
|
||||
import { FavoritesModule } from './favorites/favorites.module';
|
||||
import { DomaincheckModule } from './domaincheck/domaincheck.module';
|
||||
import { ModuleRegistryModule } from './module-registry/module-registry.module';
|
||||
@@ -34,6 +35,7 @@ import { UserModule } from './user/user.module';
|
||||
LdapModule,
|
||||
ModuleRegistryModule,
|
||||
DomaincheckModule,
|
||||
CertManagerModule,
|
||||
DashboardModule,
|
||||
CalendarModule,
|
||||
SettingsModule,
|
||||
|
||||
Reference in New Issue
Block a user