make lint happy

Author: andrewseguin

src/lib/core/overlay/scroll/scrollable.ts

@@ -1,6 +1,4 @@
-import {
-  Directive, ElementRef, OnInit, OnDestroy, Optional, SkipSelf
-} from '@angular/core';
+import {Directive, ElementRef, OnInit, OnDestroy} from '@angular/core';
 import {Observable} from 'rxjs/Observable';
 import {ScrollDispatcher} from './scroll-dispatcher';
 import 'rxjs/add/observable/fromEvent';

src/lib/sidenav/sidenav.ts

@@ -22,6 +22,7 @@ import {FocusTrap} from '../core/a11y/focus-trap';
 import {ESCAPE} from '../core/keyboard/keycodes';
 import {OverlayModule} from '../core/overlay/overlay-directives';
 import {InteractivityChecker} from '../core/a11y/interactivity-checker';
+<<<<<<< ebeb579c60bb44de259764cd9d226ea92252671e
 <<<<<<< 38f2302c080b3941ee7be5289c9a47a0d1a3bcef
 import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
 =======
@@ -30,6 +31,8 @@ import {MdLiveAnnouncer} from '../core/a11y/live-announcer';
 import {ScrollDispatcher} from '../core/scroll/scroll-dispatcher';
 >>>>>>> review response
 =======
+=======
+>>>>>>> make lint happy
 import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
 >>>>>>> move scroll to overlay
 
@@ -523,11 +526,7 @@ export class MdSidenavModule {
   static forRoot(): ModuleWithProviders {
     return {
       ngModule: MdSidenavModule,
-<<<<<<< 38f2302c080b3941ee7be5289c9a47a0d1a3bcef
       providers: [InteractivityChecker, ScrollDispatcher]
-=======
-      providers: [MdLiveAnnouncer, InteractivityChecker, ScrollDispatcher]
->>>>>>> review response
     };
   }
 }

tools/gulp/tasks/components.ts

@@ -69,6 +69,7 @@ task(':build:components:rollup', () => {
 
     // Rxjs dependencies
     'rxjs/Subject': 'Rx',
+    'rxjs/add/observable/combineLatest': 'Rx.Observable.prototype',
     'rxjs/add/observable/fromEvent': 'Rx.Observable',
     'rxjs/add/observable/forkJoin': 'Rx.Observable',
     'rxjs/add/observable/of': 'Rx.Observable',
@@ -80,7 +81,6 @@ task(':build:components:rollup', () => {
     'rxjs/add/operator/finally': 'Rx.Observable.prototype',
     'rxjs/add/operator/catch': 'Rx.Observable.prototype',
     'rxjs/add/operator/first': 'Rx.Observable.prototype',
-    'rxjs/add/operator/combineLatest': 'Rx.Observable.prototype',
     'rxjs/Observable': 'Rx'
   };