Skip to content

Commit

Permalink
fix(documentation): merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@damnko @lexzhukov
damnko authored and lexzhukov committed Mar 24, 2017
1 parent ce05d9a commit cec58da
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions demo/src/app/pages/pages.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,6 @@ import { ScrollPositionDirective } from '../theme/directives/scrollPosition.dire
import { BasicExampleComponent } from './demo/components/basic-example.component';
import { BasicExampleDataComponent } from './demo/components/basic-example-data.component';

import { BasicExampleSourceComponent } from './examples/tables/basic-example-source.component';
import { BasicExampleLoadComponent } from './examples/tables/basic-example-load.component';
import { BasicExampleMultiSelectComponent } from './examples/tables/basic-example-multi-select.component';
import { AdvancedExampleConfirmComponent } from './examples/tables/advanced-example-confirm.component';
import { AdvancedExampleServerComponent } from './examples/tables/advanced-example-server.component';
import { AdvancedExamplesTypesComponent } from './examples/tables/advanced-example-types.component';
import { AdvancedExamplesCustomEditorComponent } from './examples/tables/advanced-example-custom-editor.component';
import { AdvancedExampleFiltersComponent } from './examples/tables/advanced-example-filters.component';
import { CustomEditorComponent } from './examples/tables/custom-editor.component';
import { CustomRenderComponent } from './examples/tables/custom-render.component';

@NgModule({
imports: [
FormsModule,
Expand Down

0 comments on commit cec58da

Please sign in to comment.