Commit 75b804d
committed
chore: Merge chore_release-8.9.0@6523438c2b with chore_release-9.0.0@d9a5db020d
This is part of an incremental mergeback of chore_release-8.9.0 into chore_release-9.0.0.
Manual conflict resolutions:
app-shell/build/release-notes.md: Both branches add new release notes at the top for v8.9.0 and v9.0.0, respectively. Include 'em both, in the proper order.
app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/__tests__/ProtocolSetupCamera.test.tsx, app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx: Both branches modify the same tests, for something camera-related and something snackbar-related. Include both branches' additions.
hardware-testing/hardware_testing/gravimetric/protocol_replacement/gravimetric.py: A conflict related to what is the latest apiLevel. Take v9.0.0's version.File tree
30 files changed
+964
-103
lines changed- __mock-app-path__/protocols
- protocol_item_1
- analysis
- src
- protocol_item_2
- analysis
- src
- api
- src/opentrons/protocol_api/core/engine
- app-shell/build
- app/src
- assets/localization/en
- organisms/ODD
- ProtocolSetup/ProtocolSetupCamera
- __tests__
- QuickTransferFlow
30 files changed
+964
-103
lines changedWhitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
27 | 33 | | |
28 | 34 | | |
29 | 35 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
149 | 149 | | |
150 | 150 | | |
151 | 151 | | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
152 | 158 | | |
153 | 159 | | |
154 | 160 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
42 | 52 | | |
43 | 53 | | |
44 | 54 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| 51 | + | |
51 | 52 | | |
52 | 53 | | |
53 | 54 | | |
| |||
0 commit comments