Skip to content

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
jelbourn committed Sep 21, 2017
1 parent aacd021 commit 7b5de1b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/lib/form-field/form-field-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
* found in the LICENSE file at https://angular.io/license
*/

import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {PlatformModule} from '@angular/cdk/platform';
import {MdError} from './error';
import {MdFormField} from './form-field';
import {MdHint} from './hint';
import {MdPlaceholder} from './placeholder';
import {MdPrefix} from './prefix';
import {MdSuffix} from './suffix';
import {CommonModule} from '@angular/common';
import {PlatformModule} from '@angular/material/core';


@NgModule({
Expand Down
8 changes: 4 additions & 4 deletions src/lib/input/input-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
* found in the LICENSE file at https://angular.io/license
*/

import {NgModule} from '@angular/core';
import {MdInput} from './input';
import {MdTextareaAutosize} from './autosize';
import {PlatformModule} from '@angular/cdk/platform';
import {CommonModule} from '@angular/common';
import {PlatformModule} from '@angular/material/core';
import {NgModule} from '@angular/core';
import {MdFormFieldModule} from '@angular/material/form-field';
import {MdTextareaAutosize} from './autosize';
import {MdInput} from './input';


@NgModule({
Expand Down
8 changes: 4 additions & 4 deletions src/lib/slider/slider-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
* found in the LICENSE file at https://angular.io/license
*/

import {A11yModule} from '@angular/cdk/a11y';
import {BidiModule} from '@angular/cdk/bidi';
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {GestureConfig, MdCommonModule} from '@angular/material/core';
import {HAMMER_GESTURE_CONFIG} from '@angular/platform-browser';
import {CommonModule} from '@angular/common';
import {MdCommonModule, GestureConfig} from '@angular/material/core';
import {MdSlider} from './slider';
import {BidiModule} from '@angular/material/core';
import {A11yModule} from '@angular/cdk/a11y';


@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion src/lib/snack-bar/snack-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import {LiveAnnouncer} from '@angular/cdk/a11y';
import {Overlay, OverlayConfig, OverlayRef, OverlayState} from '@angular/cdk/overlay';
import {Overlay, OverlayConfig, OverlayRef} from '@angular/cdk/overlay';
import {ComponentPortal, ComponentType, PortalInjector} from '@angular/cdk/portal';
import {ComponentRef, Injectable, Injector, Optional, SkipSelf} from '@angular/core';
import {extendObject} from '@angular/material/core';
Expand Down

0 comments on commit 7b5de1b

Please sign in to comment.