fix merge conflicts?

USEPA · Apr 17, 2024 · 2e56359 · 2e56359
1 parent 11e7518
commit 2e56359
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 453 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
     - name: Checkout bmds-server
       uses: actions/checkout@v3
-    - name: Checkout bmds@next
+    - name: Checkout bmds@main
       uses: actions/checkout@v3
       with:
         repository: USEPA/bmds-private
@@ -140,7 +140,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Checkout bmds@next
+    - name: Checkout bmds@main
       uses: actions/checkout@v3
       with:
         repository: USEPA/bmds-private

diff --git a/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js b/frontend/src/components/Output/Multitumor/AnalysisOfDeviance.js
diff --git a/frontend/src/components/Output/Multitumor/GoodnessFit.js b/frontend/src/components/Output/Multitumor/GoodnessFit.js
diff --git a/frontend/src/components/Output/Multitumor/InfoTable.js b/frontend/src/components/Output/Multitumor/InfoTable.js
diff --git a/frontend/src/components/Output/Multitumor/ModalBody.js b/frontend/src/components/Output/Multitumor/ModalBody.js
diff --git a/frontend/src/components/Output/Multitumor/ModelOptions.js b/frontend/src/components/Output/Multitumor/ModelOptions.js
diff --git a/frontend/src/components/Output/Multitumor/ParameterSettings.js b/frontend/src/components/Output/Multitumor/ParameterSettings.js
diff --git a/frontend/src/components/Output/Multitumor/Summary.js b/frontend/src/components/Output/Multitumor/Summary.js