Fixed merging issue

Arquisoft · Mar 29, 2022 · 4fe982a · 4fe982a
1 parent 4f99dc1
commit 4fe982a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/restapi/package-lock.json b/restapi/package-lock.json
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/src/components/checkout-shipping/Shipping.tsx b/webapp/src/components/checkout-shipping/Shipping.tsx
@@ -6,7 +6,7 @@ import { getShippingCost } from '../../api/api';
 import { Box, Divider, Grid, Button } from "@mui/material";
 import Typography from "@mui/material/Typography";
 
-import "../css/Shipping.css";
+import "../../css/Shipping.css";
 
 export default function Shipping() {
     var shippingCost = getShippingCost();