chore(test):[eclipse-tractusx#529] fix merge conflicts

dsmf · Jun 19, 2024 · 6e1eeff · 6e1eeff
2 parents ed36440 + 8376176
commit 6e1eeff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/COMPATIBILITY_MATRIX.md b/COMPATIBILITY_MATRIX.md
@@ -23,7 +23,7 @@ Full changelog of IRS: [changelog](CHANGELOG.md)
 
 | Dependency                | Version                      | Helm  | Comments        |
 |---------------------------|------------------------------|-------|-----------------|
-| EDC                       | 0.7.0                        | 0.7.0 |                 |
+| EDC                       | 0.7.1                        | 0.7.1 |                 |
 | Semantics Hub             | 0.3.1                        | 0.2.1 | REST connection |
 | DTR                       | 0.4.1                        | 0.4.9 | REST connection |
 | Discovery Finder          | 0.2.5                        | -     | REST connection |

diff --git a/...sts-aspect-version-compatibility/#529-E2E-tests-aspect-version-compatibility.md b/...sts-aspect-version-compatibility/#529-E2E-tests-aspect-version-compatibility.md
@@ -48,7 +48,7 @@ Structure of test data:
 
 
 Test:
-- [Cucumber test - scenario "SingleLevelBomAsPlanned Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/features/irs-dev-529-version-compatibility.feature)
+- [Cucumber test - scenario "SingleLevelBomAsPlanned Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/org/eclipse/tractusx/irs/cucumber/features/irs-dev-529-version-compatibility.feature)
 
 
 ## SingleLevelUsageAsBuilt Version Compatibility
@@ -68,7 +68,7 @@ Structure of test data:
 
 
 Test:
-- [Cucumber test - scenario "SingleLevelBomAsBuilt Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/features/irs-dev-529-version-compatibility.feature)
+- [Cucumber test - scenario "SingleLevelBomAsBuilt Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/org/eclipse/tractusx/irs/cucumber/features/irs-dev-529-version-compatibility.feature)
 
 
 ## SingleLevelUsageAsPlanned Version Compatibility
@@ -87,7 +87,7 @@ Structure of test data:
 
 
 Test:
-- [Cucumber test - scenario "SingleLevelUsageAsPlanned Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/features/irs-dev-529-version-compatibility.feature)
+- [Cucumber test - scenario "SingleLevelUsageAsPlanned Version Compatibility"](../../../irs-cucumber-tests/src/test/resources/org/eclipse/tractusx/irs/cucumber/features/irs-dev-529-version-compatibility.feature)