From 119e716fc4fedce000a62a574c0cc00044717501 Mon Sep 17 00:00:00 2001
From: Christine Cho <tun66463@temple.edu>
Date: Mon, 1 May 2023 18:13:37 -0400
Subject: [PATCH] merge conflict

---
 documentation/docs/test-report/_category_.json            | 8 --------
 documentation/docs/test-report/integration-test-report.md | 4 ----
 documentation/docs/test-report/unit-test-report.md        | 4 ----
 .../acceptance-test-report.md                             | 0
 4 files changed, 16 deletions(-)
 delete mode 100644 documentation/docs/test-report/_category_.json
 delete mode 100644 documentation/docs/test-report/integration-test-report.md
 delete mode 100644 documentation/docs/test-report/unit-test-report.md
 rename documentation/docs/{test-report => testing-plan}/acceptance-test-report.md (100%)

diff --git a/documentation/docs/test-report/_category_.json b/documentation/docs/test-report/_category_.json
deleted file mode 100644
index 929e85d80..000000000
--- a/documentation/docs/test-report/_category_.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "label": "Test Report",
-    "position": 9,
-    "link": {
-      "type": "generated-index",
-      "description": "Report of acceptance, integration, and unit tests run."
-    }
-  }
\ No newline at end of file
diff --git a/documentation/docs/test-report/integration-test-report.md b/documentation/docs/test-report/integration-test-report.md
deleted file mode 100644
index 51ad9031d..000000000
--- a/documentation/docs/test-report/integration-test-report.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-sidebar_position: 2
----
-# Integration Tests Report
\ No newline at end of file
diff --git a/documentation/docs/test-report/unit-test-report.md b/documentation/docs/test-report/unit-test-report.md
deleted file mode 100644
index 435f73729..000000000
--- a/documentation/docs/test-report/unit-test-report.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-sidebar_position: 1
----
-# Unit Tests Report
\ No newline at end of file
diff --git a/documentation/docs/test-report/acceptance-test-report.md b/documentation/docs/testing-plan/acceptance-test-report.md
similarity index 100%
rename from documentation/docs/test-report/acceptance-test-report.md
rename to documentation/docs/testing-plan/acceptance-test-report.md