Commit 93e5768
committed
Resolve merge conflicts: Merge remote-tracking branch 'origin/sprint-develop' into MQE-326-multi-stores
# Conflicts:
# src/Magento/FunctionalTestingFramework/DataGenerator/Api/ApiExecutor.php
# src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/JsonDefinitionObjectHandler.php
# src/Magento/FunctionalTestingFramework/DataGenerator/Objects/DataElement.php
# src/Magento/FunctionalTestingFramework/DataGenerator/Util/JsonObjectExtractor.php
# src/Magento/FunctionalTestingFramework/Util/TestGenerator.php1 parent 97bd6b8 commit 93e5768
File tree
6 files changed
+67
-728
lines changed- src/Magento/FunctionalTestingFramework/DataGenerator
- Api
- Handlers
- Persist
- Util
6 files changed
+67
-728
lines changedLines changed: 0 additions & 368 deletions
This file was deleted.
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
173 | 174 | | |
174 | 175 | | |
175 | 176 | | |
176 | | - | |
| 177 | + | |
| 178 | + | |
177 | 179 | | |
178 | 180 | | |
179 | 181 | | |
| |||
201 | 203 | | |
202 | 204 | | |
203 | 205 | | |
| 206 | + | |
204 | 207 | | |
205 | 208 | | |
206 | 209 | | |
| |||
0 commit comments