conflict solve accept incoming change
This commit is contained in:
@@ -16,10 +16,6 @@ export const appConfig: ApplicationConfig = {
|
|||||||
provideAnimations(),
|
provideAnimations(),
|
||||||
provideCharts(withDefaultRegisterables()),
|
provideCharts(withDefaultRegisterables()),
|
||||||
importProvidersFrom(
|
importProvidersFrom(
|
||||||
<<<<<<< HEAD
|
|
||||||
// AngularFireModule.initializeApp(environment.firebase),
|
|
||||||
=======
|
|
||||||
>>>>>>> 57a78d474e29f841480fe608029878e17ea5f325
|
|
||||||
ToastrModule.forRoot({
|
ToastrModule.forRoot({
|
||||||
timeOut: 1500,
|
timeOut: 1500,
|
||||||
closeButton: true,
|
closeButton: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user