Skip to content

Commit 99cc2e4

Browse files
authored
chore(menu): fix a11y module being imported twice from merge conflict (#9538)
1 parent e3b5e3f commit 99cc2e4

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/lib/menu/menu-module.ts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,23 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
import {NgModule} from '@angular/core';
10-
import {CommonModule} from '@angular/common';
11-
import {MatCommonModule} from '@angular/material/core';
12-
import {OverlayModule} from '@angular/cdk/overlay';
139
import {A11yModule} from '@angular/cdk/a11y';
14-
import {MatMenu, MAT_MENU_DEFAULT_OPTIONS} from './menu-directive';
10+
import {OverlayModule} from '@angular/cdk/overlay';
11+
import {CommonModule} from '@angular/common';
12+
import {NgModule} from '@angular/core';
13+
import {MatCommonModule, MatRippleModule} from '@angular/material/core';
14+
import {MAT_MENU_DEFAULT_OPTIONS, MatMenu} from './menu-directive';
1515
import {MatMenuItem} from './menu-item';
16-
import {MatMenuTrigger, MAT_MENU_SCROLL_STRATEGY_PROVIDER} from './menu-trigger';
17-
import {MatRippleModule} from '@angular/material/core';
18-
import {A11yModule} from '@angular/cdk/a11y';
16+
import {MAT_MENU_SCROLL_STRATEGY_PROVIDER, MatMenuTrigger} from './menu-trigger';
1917

2018

2119
@NgModule({
2220
imports: [
23-
OverlayModule,
24-
CommonModule,
2521
A11yModule,
26-
MatRippleModule,
22+
CommonModule,
2723
MatCommonModule,
28-
A11yModule,
24+
MatRippleModule,
25+
OverlayModule,
2926
],
3027
exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatCommonModule],
3128
declarations: [MatMenu, MatMenuItem, MatMenuTrigger],

0 commit comments

Comments
 (0)