Commit 11f3153
committed
Merge branch 'main' into split-compare-e2e
# Conflicts:
# e2e/cli-e2e/tests/__snapshots__/collect.e2e.test.ts.snap
# e2e/cli-e2e/tests/collect.e2e.test.ts
# e2e/plugin-coverage-e2e/mocks/fixtures/basic-setup/package.json
# e2e/plugin-coverage-e2e/tests/collect.e2e.test.ts
# examples/react-todos-app/code-pushup.config.js
# nx.json2 files changed
+2
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
| 19 | + | |
| 20 | + | |
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | 31 | | |
39 | 32 | | |
40 | 33 | | |
| |||
0 commit comments