feat: #41 - resolving conflicting files

hngprojects · Jul 22, 2024 · a8fd63a · a8fd63a
1 parent 670abce
commit a8fd63a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/components/dashboard/userdashboard.tsx b/app/components/dashboard/userdashboard.tsx
@@ -2,8 +2,8 @@
 import avatar from "/images/avatar.png";
 import drop from "/images/drop.png";
 import logo from "/images/logo.png";
-import menu from "/images/Menu.png";
-import notification from "/images/Notification.png";
+import menu from "/images/spec/Menu.png";
+import notification from "/images/spec/Notification.png";
 import question from "/images/question.png";
 import search from "/images/search.png";
 import { useEffect, useState } from "react";

diff --git a/public/images/menu.png → public/images/spec/Menu.png b/public/images/menu.png → public/images/spec/Menu.png
diff --git a/public/images/notification.png → public/images/spec/Notification.png b/public/images/notification.png → public/images/spec/Notification.png