rebase conflicts

frontend/src/components/WaitingTime.js

@@ -7,10 +7,6 @@ export default function WaitingTime({ place }) {
   const baseURL = process.env.REACT_APP_BASE_URL_BACK + "/" + place + "/waiting_time";
   const [post, setPost] = React.useState(null);
 
-export default function WaitingTime({place}) {
-    const url = process.env.REACT_APP_BASE_URL_BACK + '/' + place + "/waiting_time";
-    const [post, setPost] = React.useState(null);
-
     React.useEffect(() => {
       axios.get(url).then((response) => {
         if (response.data < 60) {setPost(0)} else{

frontend/src/views/Eiffel.js

 import React from "react";
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import Timetable from "../components/Timetable";
 import WaitingTime from "../components/WaitingTime";
+=======
+import { DailyGraph, Timetable, WaitingTime } from "../components"
+>>>>>>> bf558ae2c3015d5a6116d598f029b01b29bf8bd0
 
 export default function Eiffel() {
   return (
@@ -29,7 +33,10 @@ export default function Eiffel() {
 =======
 import { DailyGraph, Timetable, WaitingTime } from "../components"
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> bf558ae2c3015d5a6116d598f029b01b29bf8bd0
 export default function Eiffel() {
     return (
       <div>