From 889debb8c7292825166295e87c6c0c8ff2e1e105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=B8yland?= <daniehoy@stud.ntnu.no>
Date: Tue, 7 May 2024 13:50:11 +0200
Subject: [PATCH] enoek merge conflict?
---
Frontend/power-tracker/src/components/enoekAdd.tsx | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/Frontend/power-tracker/src/components/enoekAdd.tsx b/Frontend/power-tracker/src/components/enoekAdd.tsx
index a26064f..55e7734 100644
--- a/Frontend/power-tracker/src/components/enoekAdd.tsx
+++ b/Frontend/power-tracker/src/components/enoekAdd.tsx
@@ -57,7 +57,6 @@ interface ManageAddingProps {
//class for the data getting fetched from processes
class Processes {
name: string = "";
-<<<<<<< HEAD
constructor(name: string) {
this.name = name;
}
@@ -66,16 +65,6 @@ class Processes {
const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search }) => {
//start and enddate storage for the calendar pickers
-=======
- constructor(name: string) {
- this.name = name;
- }
-}
-
-
-const MainComponent: React.FC<ManageAddingProps> = ({ enoek, setData, search }) =>{
- const [title, setTitle] = useState("");
->>>>>>> 28d4a141fb2e68bf004f7b1bf506fee7d7b36df9
const [startDate, setStarDate] = React.useState<Date>()
const [endDate, setEndDate] = React.useState<Date>()
--
GitLab