resolved merge conflict due to new entry in domains.csv

share/domains.csv

@@ -265,4 +265,5 @@ 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
 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