fix(EditActivityButton): resolved merge conflict

Signed-off-by: Frederick Baier <[email protected]>
amosproj · Feb 2, 2025 · 1c11952 · 1c11952
1 parent 77a0471
commit 1c11952
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/src/components/EditActivityButton.tsx b/app/src/components/EditActivityButton.tsx
@@ -45,7 +45,7 @@ export function EditActivityButton({ activity, updateActivity }: AlertIconDialog
     const newActivity: Activity = {
       id: activity.id,
       name: values.name,
-      activityType: activity.activityType,
+      type: activity.type,
       duration: values.duration,
       energy: values.energy,
       favorite: activity.favorite