Merge branch 'master' into feature/logger

# Conflicts:
#	CMakeLists.txt
#	src/file/mail.cpp
#	src/file/settings.cpp
#	src/management/logger.cpp
#	src/management/logger.hpp
#	src/message/sender.cpp
#	src/message/sender.hpp

1 files changed, 4 insertions, 4 deletions

diff --git a/src/file/mail.hpp b/src/file/mail.hpp
index 34050bf..148aa11 100644
--- a/src/file/mail.hpp
+++ b/src/file/mail.hpp
@@ -3,22 +3,22 @@
 #include <string>
 #include <optional>
 
-#include "managment/general.hpp"
+#include "management/general.hpp"
+#include "checker/registrator_mails.hpp"
 
 namespace smtp::file
 {
     class Mail
     {
     public:
-        explicit Mail( std::string const& path_file );
+        explicit Mail( std::string const& path_file, checker::RegistratorMails const& registrator_errors );
         ~Mail() = default;
 
         manage::MailsSet Read() const;
         bool Write( manage::MailsSet const& data ) const;
     private:
-        std::optional<std::string> GetMailFromLine( std::string const& line ) const;
-
         std::string mPathFile;
+		checker::RegistratorMails mRegistratorErrors;
     };
 
 }