Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # src/app/app.module.ts
This commit is contained in:
@@ -8,6 +8,7 @@ import { ListComponent } from './list/list.component';
|
||||
import { DetailComponent } from './detail/detail.component';
|
||||
import {FormsModule} from "@angular/forms";
|
||||
import {HttpClientModule} from "@angular/common/http";
|
||||
import { SafePipe } from './pipes/safe.pipe';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
@@ -19,8 +20,7 @@ import {HttpClientModule} from "@angular/common/http";
|
||||
imports: [
|
||||
BrowserModule,
|
||||
AppRoutingModule,
|
||||
FormsModule,
|
||||
HttpClientModule,
|
||||
FormsModule
|
||||
],
|
||||
providers: [],
|
||||
bootstrap: [AppComponent]
|
||||
|
||||
Reference in New Issue
Block a user