冲突修正

fengxiang

2018-03-13 936bb39145eee86530f61d3345f8125ddd778225

 src/app/business/business.module.ts

@@ -12,11 +12,11 @@
import 'rxjs/add/operator/switchMap';
import 'rxjs/add/operator/toPromise';
import 'rxjs/add/operator/filter';
import { LocalStorageStore } from '@delon/auth';

@NgModule({
  imports: [
    CommonModule,
    
  ]
    CommonModule,    
  ],
})
export class BusinessModule { }