From 67525b2aac48c61e4ace98fa5cc884f82e515be1 Mon Sep 17 00:00:00 2001
From: VadhwanaParth15 <parthvadhwana050@gmail.com>
Date: Thu, 9 Feb 2023 10:51:53 +0530
Subject: [PATCH] zxz

---
 src/App.jsx                      |  2 +-
 src/components/Events/Event.jsx  | 18 +++++++++---------
 src/components/signup/Signup.css |  4 ----
 src/components/signup/Signup.jsx |  4 +---
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index 1ef2913..43f37fb 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -8,7 +8,7 @@ import Event from "./components/Events/Event";
 import Sponsor from "./components/Sponsor/Sponsor";
 import { NavBar } from "./components/Nav/NavBar";
 import Glimpse from "./components/Glimpse/Glimpse";
-import Signup from "./components/Signup/Signup";
+import Signup from "./components/signup/Signup";
 import { render } from "@testing-library/react";
 const App = () => {
 
diff --git a/src/components/Events/Event.jsx b/src/components/Events/Event.jsx
index 1dc3984..c606001 100644
--- a/src/components/Events/Event.jsx
+++ b/src/components/Events/Event.jsx
@@ -31,31 +31,31 @@ function Event() {
     },
     {
       imgurl: "assests/Events/innovative.png",
-      title: "inovative heist",
+      title: "arcadian evovle",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/sharks.png",
+      title: "s.h.a.r.k.s",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/handson.png",
+      title: "Hands-on",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/ws.png",
+      title: "workshop",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
     {
-      imgurl: "assests/Events/cyber.png",
-      title: "wheels & wings",
+      imgurl: "assests/Events/fab.png",
+      title: "Fab-Lab",
       description: "orem ipsum dolor sit amet, consectetur adipiscing elit. Cras magna leo, porta a justo at, suscipit scelerisque erat. Quisque risus dui, ultrices ac semper sed,",
       link: "",
     },
diff --git a/src/components/signup/Signup.css b/src/components/signup/Signup.css
index 6ad7557..4d41859 100644
--- a/src/components/signup/Signup.css
+++ b/src/components/signup/Signup.css
@@ -31,8 +31,6 @@
     text-align: center;
 }
 
-
-<<<<<<< HEAD
 .scontent{
     display: flex;
     justify-content: center;
@@ -80,5 +78,3 @@
 
 
 
-=======
->>>>>>> 8823b651373b5423cdf7c57224838b969736e12b
diff --git a/src/components/signup/Signup.jsx b/src/components/signup/Signup.jsx
index cc7f7dd..0a276e2 100644
--- a/src/components/signup/Signup.jsx
+++ b/src/components/signup/Signup.jsx
@@ -22,14 +22,12 @@ const Signup = () => {
 
             </div>
             
-<<<<<<< HEAD
-=======
+
              <div className="s-content">
               <div className="email">
                 Email: <input type="email"/> 
               </div>
              </div>
->>>>>>> 8823b651373b5423cdf7c57224838b969736e12b