From 818fff5404434008f9c05269fcc26f6c5237f8b5 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Tue, 2 Aug 2022 01:01:40 -0500
Subject: [PATCH] Fixed merge errors

---
 client/src/containers/Mail.jsx                               | 2 --
 client/src/controllers/FormControllers/SendMailController.js | 3 ++-
 client/src/controllers/FormControllers/index.js              | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/src/containers/Mail.jsx b/client/src/containers/Mail.jsx
index 6f62eb6..18c7274 100644
--- a/client/src/containers/Mail.jsx
+++ b/client/src/containers/Mail.jsx
@@ -1,7 +1,5 @@
 import { Card, CardContent } from '@mui/material';
 import React, { useEffect } from 'react';
-import { Inbox, SendMail } from 'controllers';
-import { MdPreview } from 'components';
 import { useNavigate } from 'react-router-dom';
 
 import { useUser } from 'contexts';
diff --git a/client/src/controllers/FormControllers/SendMailController.js b/client/src/controllers/FormControllers/SendMailController.js
index 828400e..b9e1333 100644
--- a/client/src/controllers/FormControllers/SendMailController.js
+++ b/client/src/controllers/FormControllers/SendMailController.js
@@ -4,7 +4,8 @@ import { composeMailFields } from 'services/fields';
 import { postMail } from 'services/mailServices';
 import { mailSchema } from 'services/schemas';
 import { useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useUser } from 'contexts';
+
 export default function SendMailController() {
     const { userData } = useUser();
 
diff --git a/client/src/controllers/FormControllers/index.js b/client/src/controllers/FormControllers/index.js
index cb94297..80d5141 100644
--- a/client/src/controllers/FormControllers/index.js
+++ b/client/src/controllers/FormControllers/index.js
@@ -8,7 +8,7 @@ import ResetForm from './ResetFormController';
 import SendMail from './SendMailController';
 import SearchForm from './SearchFormController';
 import UpdateForm from './UpdateFormController';
-import AnswerForm from './AnwerFormController';
+
 export {
     AnswerForm,
     AskForm,
@@ -20,5 +20,4 @@ export {
     SendMail,
     SearchForm,
     UpdateForm,
-    AnswerForm,
 };