From 1fb4b6932856e62b48083203371e002d8af8b501 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Tue, 23 Jan 2018 08:35:40 -0800 Subject: [PATCH] chore(menu): fix a11y module being imported twice from merge conflict --- src/lib/menu/menu-module.ts | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/lib/menu/menu-module.ts b/src/lib/menu/menu-module.ts index 843ffb8299a5..dcab6ce4880a 100644 --- a/src/lib/menu/menu-module.ts +++ b/src/lib/menu/menu-module.ts @@ -6,26 +6,23 @@ * found in the LICENSE file at https://angular.io/license */ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {MatCommonModule} from '@angular/material/core'; -import {OverlayModule} from '@angular/cdk/overlay'; import {A11yModule} from '@angular/cdk/a11y'; -import {MatMenu, MAT_MENU_DEFAULT_OPTIONS} from './menu-directive'; +import {OverlayModule} from '@angular/cdk/overlay'; +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {MatCommonModule, MatRippleModule} from '@angular/material/core'; +import {MAT_MENU_DEFAULT_OPTIONS, MatMenu} from './menu-directive'; import {MatMenuItem} from './menu-item'; -import {MatMenuTrigger, MAT_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger'; -import {MatRippleModule} from '@angular/material/core'; -import {A11yModule} from '@angular/cdk/a11y'; +import {MAT_MENU_SCROLL_STRATEGY_PROVIDER, MatMenuTrigger} from './menu-trigger'; @NgModule({ imports: [ - OverlayModule, - CommonModule, A11yModule, - MatRippleModule, + CommonModule, MatCommonModule, - A11yModule, + MatRippleModule, + OverlayModule, ], exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatCommonModule], declarations: [MatMenu, MatMenuItem, MatMenuTrigger],