Skip to content

Commit e59c30e

Browse files
author
Ju
committed
Feat. authenticationNumber gnims-project#78 InputEmail 애러해결
1 parent 2348e2e commit e59c30e

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

src/components/login/InputEmail.jsx

-8
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,7 @@ const InputEmail = () => {
225225
/>
226226
<div
227227
onClick={onSendEmail}
228-
<<<<<<< HEAD
229228
className="bg-[#FFFFFF] h-[50px] flex items-center border-solid border-2 text-[16px] font-[600] border-[#002C51] p-[5px] rounded-[4px] cursor-pointer"
230-
=======
231-
<<<<<<< Updated upstream
232-
className=" bg-[#FFFFFF] flex items-center h-[50px] p-[5px] border-solid border-2 text-[16px] font-[600] border-[#002C51] rounded-[4px] leading-[28px] cursor-pointer"
233-
=======
234-
className="bg-[#FFFFFF] h-[50px] flex items-center border-solid border-2 text-[16px] font-[600] border-[#002C51] p-[5px] rounded-[4px] cursor-pointer"
235-
>>>>>>> Stashed changes
236-
>>>>>>> 882c003dc362d87eeda9013aa11f153e22807a5a
237229
>
238230
인증 요청
239231
</div>

0 commit comments

Comments
 (0)