sebse/angulardynformmodule
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/modules/dyn-form/dyn-form.module.ts
This commit is contained in:
Sebastian Seedorf
2017-05-30 09:20:34 +02:00
parent 48b4f67b06 5f66284d02
commit 8c6da2e28f
12 changed files with 346 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/app.module.ts
View File

@@ -1,8 +1,8 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import {NgModule} from '@angular/core';
import {BrowserModule} from '@angular/platform-browser';
import { AppComponent } from './app.component';
import { DynFormModule } from './modules/dyn-form/dyn-form.module';
import {AppComponent} from './app.component';
import {DynFormModule} from './modules/dyn-form/dyn-form.module';
import {HttpCachedService} from './services/http-cached.service';
import {HttpModule} from '@angular/http';