From 38369686c9df1912b6cc46b84bff72e498611a4e Mon Sep 17 00:00:00 2001 From: Roland Puntaier Date: Wed, 4 Sep 2019 14:08:04 +0200 Subject: [PATCH] resolved merge conflict due to new entry in domains.csv --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 343b33f..a3b5bbe 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -264,6 +264,7 @@ yandex.net,imap.yandex.com,993,smtp.yandex.com,587 yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 +tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 mailo.com,mail.mailo.com,993,mail.mailo.com,465 mail.mcgill.ca,outlook.office365.com,993,smtp.office365.com,587 chello.at,mail.upcmail.at,995,mail.upcmail.at,465