merge conflict

Capstone-Projects-2023-Spring · May 1, 2023 · 119e716 · 119e716
1 parent d2a865a
commit 119e716
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 16 deletions.
diff --git a/documentation/docs/test-report/_category_.json b/documentation/docs/test-report/_category_.json
diff --git a/documentation/docs/test-report/integration-test-report.md b/documentation/docs/test-report/integration-test-report.md
diff --git a/documentation/docs/test-report/unit-test-report.md b/documentation/docs/test-report/unit-test-report.md
diff --git a/...ocs/test-report/acceptance-test-report.md → ...cs/testing-plan/acceptance-test-report.md b/...ocs/test-report/acceptance-test-report.md → ...cs/testing-plan/acceptance-test-report.md