diff --git a/frontend/html/dashboard.html b/frontend/html/dashboard.html index 622ca8f..4c69518 100644 --- a/frontend/html/dashboard.html +++ b/frontend/html/dashboard.html @@ -201,9 +201,12 @@ p <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> a260428 (Dashboard Entry Update) ======= +======= +>>>>>>> 69bfc65 (Add Form Logic)