From e9f6fdf26f2cdd3e02fed628acd0b153801fa545 Mon Sep 17 00:00:00 2001
From: Andrean <88448470+QkoSad@users.noreply.github.com>
Date: Mon, 8 May 2023 16:56:24 +0000
Subject: [PATCH] Update DashboardActions.js

---
 client/src/components/dashboard/DashboardActions.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/src/components/dashboard/DashboardActions.js b/client/src/components/dashboard/DashboardActions.js
index a9961be..3a63e5d 100644
--- a/client/src/components/dashboard/DashboardActions.js
+++ b/client/src/components/dashboard/DashboardActions.js
@@ -17,8 +17,4 @@ const DashboardActions = () => {
   );
 };
 
-<<<<<<< HEAD
 export default DashboardActions;
-=======
-export default DashboardActions;
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb