#5 df: merge conflict v15

dqualizer · Sep 7, 2023 · 5cadd10 · 5cadd10
1 parent 42e35c4
commit 5cadd10
Show file tree

Hide file tree

Showing 28 changed files with 3 additions and 1,038 deletions.
diff --git a/src/components/loadtest/SpecButtons.jsx b/src/components/loadtest/SpecButtons.jsx
diff --git a/src/components/loadtest/SpecCheckbox.jsx b/src/components/loadtest/SpecCheckbox.jsx
diff --git a/src/components/loadtest/SpecSlider.jsx b/src/components/loadtest/SpecSlider.jsx
diff --git a/src/components/testing/Breadcrumb.jsx → ...onents/rqaExplorer/rqaTree/Breadcrumb.jsx b/src/components/testing/Breadcrumb.jsx → ...onents/rqaExplorer/rqaTree/Breadcrumb.jsx
diff --git a/src/components/testing/MenuSidebar.jsx → ...nents/rqaExplorer/rqaTree/MenuSidebar.jsx b/src/components/testing/MenuSidebar.jsx → ...nents/rqaExplorer/rqaTree/MenuSidebar.jsx
diff --git a/src/components/testing/components/Burger.jsx → ...rqaExplorer/rqaTree/components/Burger.jsx b/src/components/testing/components/Burger.jsx → ...rqaExplorer/rqaTree/components/Burger.jsx
diff --git a/...ponents/testing/components/DomainList.jsx → ...xplorer/rqaTree/components/DomainList.jsx b/...ponents/testing/components/DomainList.jsx → ...xplorer/rqaTree/components/DomainList.jsx
diff --git a/...nts/testing/components/DomainListItem.jsx → ...rer/rqaTree/components/DomainListItem.jsx b/...nts/testing/components/DomainListItem.jsx → ...rer/rqaTree/components/DomainListItem.jsx
diff --git a/...ponents/testing/components/DomainTabs.jsx → ...xplorer/rqaTree/components/DomainTabs.jsx b/...ponents/testing/components/DomainTabs.jsx → ...xplorer/rqaTree/components/DomainTabs.jsx
diff --git a/...onents/testing/components/YourDomains.jsx → ...plorer/rqaTree/components/YourDomains.jsx b/...onents/testing/components/YourDomains.jsx → ...plorer/rqaTree/components/YourDomains.jsx
diff --git a/src/components/rqa_explorer/RqaInputField.jsx b/src/components/rqa_explorer/RqaInputField.jsx
diff --git a/src/components/testing/DeleteLoadtest.jsx b/src/components/testing/DeleteLoadtest.jsx
diff --git a/src/components/testing/DeleteRqa.jsx b/src/components/testing/DeleteRqa.jsx
diff --git a/src/components/testing/EditLoadtest.jsx b/src/components/testing/EditLoadtest.jsx
diff --git a/src/components/testing/Explorer.jsx b/src/components/testing/Explorer.jsx