Skip to content

Commit de3222a

Browse files
authored
fix(mdc-button-benchmark): fix unresolved merge conflict (#20221)
1 parent b4309e5 commit de3222a

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

test/benchmarks/mdc/button/button.perf-spec.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,7 @@ describe('button performance benchmarks', () => {
3232
ignoreBrowserSynchronization: true,
3333
params: [],
3434
setup: async () => await $('#show').click(),
35-
<<<<<<< HEAD
36-
<<<<<<< HEAD
3735
work: async () => await $('.mat-mdc-raised-button').click(),
38-
=======
39-
work: async () => await $('.mat-raised-button').click(),
40-
>>>>>>> f1ae4d955... test(mdc-button): add performance tests for mdc-button
41-
=======
42-
work: async () => await $('.mat-mdc-raised-button').click(),
43-
>>>>>>> 63f2747fc... fixup! test(mdc-button): add performance tests for mdc-button
4436
});
4537
});
4638
});

0 commit comments

Comments
 (0)