Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Commit

Permalink
fix: merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
BoYanZh committed Mar 20, 2024
1 parent 0ff0e3f commit 6f1343d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions src/pages/Login/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const LoginForm: React.FC = () => {
const { user } = useAuth()
const [error, setError] = useState('')
const [searchParams] = useSearchParams()
const [error, setError] = useState('')
const [username, setUsername] = useState('demo')
const [password, setPassword] = useState('123456')
const [remember, setRemember] = useState(false)
Expand Down Expand Up @@ -61,7 +60,6 @@ const LoginForm: React.FC = () => {
<h1>Login</h1>
</div>
<Col xs={12} md={8} lg={6} className='mx-auto mt-3'>
{error ? <Alert variant='danger'>{error}</Alert> : null}
<Form onSubmit={handleSubmit} validated>
<Form.Group as={Row} className='mb-3' controlId='formBasicEmail'>
<Form.Label className='text-sm-end' column sm={2}>
Expand Down

0 comments on commit 6f1343d

Please sign in to comment.