From 488d72315e313552d55188b4067d2df7451bb133 Mon Sep 17 00:00:00 2001
From: tarunkumar2005 <tarunkumar6258278@gmail.com>
Date: Thu, 3 Oct 2024 22:06:48 +0530
Subject: [PATCH] Resolved the conflicts

---
 frontend/src/Pages/LoginPage.jsx | 12 ++++++------
 frontend/src/Pages/Register.jsx  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Pages/LoginPage.jsx b/frontend/src/Pages/LoginPage.jsx
index 3e4bd21..7acd654 100644
--- a/frontend/src/Pages/LoginPage.jsx
+++ b/frontend/src/Pages/LoginPage.jsx
@@ -56,15 +56,15 @@ const Login = () => {
 
             {/* Login Form */}
             <form onSubmit={handleLogin} className="bg-white p-8 rounded-lg shadow-lg w-full max-w-md">
-                {/* Username Input */}
+                {/* Email Input */}
                 <div className="mb-6">
-                    <label className="block text-gray-700 font-semibold mb-2" htmlFor="username">Username</label>
+                    <label className="block text-gray-700 font-semibold mb-2" htmlFor="email">Email</label>
                     <input
                         type="text"
-                        id="username"
-                        value={username}
-                        onChange={(e) => setUsername(e.target.value)}
-                        placeholder="Enter your username"
+                        id="email"
+                        value={email}
+                        onChange={(e) => setEmail(e.target.value)}
+                        placeholder="Enter your email"
                         className="w-full px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 transition duration-300"
                         required
                     />
diff --git a/frontend/src/Pages/Register.jsx b/frontend/src/Pages/Register.jsx
index eabe7bb..1cd0b8d 100644
--- a/frontend/src/Pages/Register.jsx
+++ b/frontend/src/Pages/Register.jsx
@@ -137,4 +137,4 @@ const Register = () => {
     );
 };
 
-export default Register;
+export default Register;
\ No newline at end of file