diff options
| author | claiff <claiff@mail.ru> | 2022-09-21 16:05:06 +0300 |
|---|---|---|
| committer | claiff <claiff@mail.ru> | 2022-09-21 16:05:06 +0300 |
| commit | ee8c175e9eae4faccdf913578fb30d09c200204f (patch) | |
| tree | c2244021130919d5360d130fd3b38954a096687b /src/main.cpp | |
| parent | a282ae6418c85db1aae5a2823dd37d56e56e5249 (diff) | |
| parent | 641c95dcf8c6585caaa6e79d4bec9b53fd666369 (diff) | |
| download | obmc-sila-smtp-ee8c175e9eae4faccdf913578fb30d09c200204f.tar.xz | |
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
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index b58bb69..cc92f3f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,8 +1,8 @@ #include <sdbusplus/asio/connection.hpp> #include "service/smtp.hpp" -#include "managment/builder/mail.hpp" -#include "managment/builder/settings.hpp" +#include "management/builder/mail.hpp" +#include "management/builder/settings.hpp" int main() { |