Skip to content

Commit

Permalink
fix: removing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Srish-ty committed May 3, 2024
1 parent f309d80 commit f9c9f93
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
8 changes: 0 additions & 8 deletions src/components/form/FormContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ import { storeFormData } from '../../firebase/registration';
import { toCloudinary } from './uploadingFiles';
import { registrationOptions, branchOptions } from '../../data/formInformation';



import { toast } from 'react-toastify';
import Button from '../shared/Button';


const FormContainer = () => {
const { userInfo } = useContext(AuthContext);
const [currentUser, userData] = userInfo;
Expand Down Expand Up @@ -96,11 +93,6 @@ const FormContainer = () => {
}
e.preventDefault();
try {





const documentId = await toast.promise(storeFormData(formData), {
loading: 'Registering...',
success: 'Registration successful',
Expand Down
3 changes: 0 additions & 3 deletions src/pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,5 @@ export default {
Home: lazy(() => import('./home')),
Playground: lazy(() => import('./playground')),



Register: lazy(() => import('./register')),

};

0 comments on commit f9c9f93

Please sign in to comment.