Commit 672e56a
committed
chore: Fix merge conflict causing ProtocolSetupCamera.test.tsx unit test failure
This is part of an incremental mergeback of chore_release-8.9.0 into chore_release-9.0.0.
It looks like commit c241a9c in chore_release-9.0.0 changed the way the mocks in this file are set up, while chore_release-8.9.0 added a new test to this file. The resolution is to modify the new test to have the new mock setup.1 parent 75b804d commit 672e56a
File tree
1 file changed
+1
-0
lines changed- app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/__tests__
1 file changed
+1
-0
lines changedLines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
| 167 | + | |
167 | 168 | | |
168 | 169 | | |
169 | 170 | | |
| |||
0 commit comments