move scroll to overlay

Author: andrewseguin

src/lib/core/core.ts

@@ -6,7 +6,6 @@ import {PortalModule} from './portal/portal-directives';
 import {OverlayModule} from './overlay/overlay-directives';
 import {A11yModule, A11Y_PROVIDERS} from './a11y/index';
 import {OVERLAY_PROVIDERS} from './overlay/overlay';
-import {ScrollDispatcher} from './scroll/scroll-dispatcher';
 
 
 // RTL

src/lib/core/scroll/scroll-dispatcher.spec.ts

@@ -26,8 +26,12 @@ import {InteractivityChecker} from '../core/a11y/interactivity-checker';
 import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
 =======
 import {MdLiveAnnouncer} from '../core/a11y/live-announcer';
+<<<<<<< 7f62f0a674630555a66a123367e701089f68e338
 import {ScrollDispatcher} from '../core/scroll/scroll-dispatcher';
 >>>>>>> review response
+=======
+import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher';
+>>>>>>> move scroll to overlay
 
 
 /** Exception thrown when two MdSidenav are matching the same side. */