bugfix
This commit is contained in:
parent
d78506cb8e
commit
24c817be70
|
@ -36,12 +36,7 @@ import { TranslationComponent as MBTranslationComponent } from './components/mes
|
||||||
import { VideoComponent as MBVideoComponent } from './components/message-box/video.component';
|
import { VideoComponent as MBVideoComponent } from './components/message-box/video.component';
|
||||||
import { VideoConferenceComponent as MBVideoConferenceComponent } from './components/message-box/video-conference.component';
|
import { VideoConferenceComponent as MBVideoConferenceComponent } from './components/message-box/video-conference.component';
|
||||||
import { AllimComponent as MBAllimComponent } from './components/message-box/allim.component';
|
import { AllimComponent as MBAllimComponent } from './components/message-box/allim.component';
|
||||||
<<<<<<< HEAD
|
|
||||||
import { SearchComponent } from './components/search.component';
|
|
||||||
import { TranslateModule } from '@ngx-translate/core';
|
|
||||||
import { MatTooltipModule } from '@angular/material';
|
import { MatTooltipModule } from '@angular/material';
|
||||||
=======
|
|
||||||
>>>>>>> 704b2a09834f43610fe3eaaf982c94be25927985
|
|
||||||
|
|
||||||
const COMPONENTS = [
|
const COMPONENTS = [
|
||||||
FormComponent,
|
FormComponent,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user