Fixed merge error

columbiaspace · Feb 22, 2024 · 95c2d34 · 95c2d34
1 parent 84590a2
commit 95c2d34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/pages/equipment.js b/src/pages/equipment.js
@@ -5,7 +5,7 @@ function equipment() {
   return (
     <div>
       <h1>Equipment</h1>
-<p>This page should show procedures for equipment repair scenarios, potentially in some form of dictionary</p>
+      <p>This page should show procedures for equipment repair scenarios, potentially in some form of dictionary</p>
     </div>
   );
 }

diff --git a/src/pages/rocks.js b/src/pages/rocks.js
@@ -3,8 +3,6 @@ import './../pages-style/rocks.css';
 
 import { ProcedureList } from '../helpers/ProcedureList';
 import ProcedureItem from '../components/ProcedureItem';
-function rocks() {
-
 
 function Rocks() {
   const [showWarning, setShowWarning] = useState(false);
@@ -23,6 +21,7 @@ function Rocks() {
       <p>This page will display samples that have been collected, and what samples should be kept</p>
       <div className = "ProcedureList"> 
       {ProcedureList.map((Item, key) =>{
+        return (
           <ProcedureItem
           key = {key}
           name = {Item.name}