From fe4c01615633403e6da1f0f086b87eeb584247ec Mon Sep 17 00:00:00 2001 From: NishantSinghhhhh Date: Wed, 30 Oct 2024 10:08:04 +0530 Subject: [PATCH] Removing merge conflicts Signed-off-by: NishantSinghhhhh --- src/sections/Projects/Sistent/components/avatar/index.js | 2 ++ src/sections/Projects/Sistent/components/index.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sections/Projects/Sistent/components/avatar/index.js b/src/sections/Projects/Sistent/components/avatar/index.js index 357d829249ec..4136b8a70572 100644 --- a/src/sections/Projects/Sistent/components/avatar/index.js +++ b/src/sections/Projects/Sistent/components/avatar/index.js @@ -11,6 +11,8 @@ import Image from "../../../../../assets/images/avatar-images/avatar.png"; import Image1 from "../../../../../assets/images/avatar-images/avatar1.png"; import Image2 from "../../../../../assets/images/avatar-images/avatar2.png"; +// removing merge conflicts + const SmallAvatar = styled(Avatar)(({ theme }) => ({ width: 22, height: 22, diff --git a/src/sections/Projects/Sistent/components/index.js b/src/sections/Projects/Sistent/components/index.js index 048d08fc8821..65e89e9cf00f 100644 --- a/src/sections/Projects/Sistent/components/index.js +++ b/src/sections/Projects/Sistent/components/index.js @@ -59,7 +59,7 @@ const componentsData = [ url: "/projects/sistent/components/link", }, { - id: 7, + id: 8, name: "Avatar", description: "A Avatar is an interactive element that triggers a specific action takes users where they need to go, and points out what happens next in a given flow.",