Removing merge conflicts

Signed-off-by: NishantSinghhhhh <[email protected]>
layer5io · Oct 30, 2024 · fe4c016 · fe4c016
1 parent 06abfd2
commit fe4c016
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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.",