From a98145962fe68326037d381a1e6136ff0a0b9e11 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 7 May 2019 18:53:13 +0200
Subject: [PATCH] Merged Outlook/Office365 provider

---
 app/src/main/res/xml/providers.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 9966e21e01..39a26a488f 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -16,20 +16,7 @@
             starttls="false" />
     </provider>
     <provider
-        name="Outlook"
-        link="https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040"
-        order="2">
-        <imap
-            host="imap-mail.outlook.com"
-            port="993"
-            starttls="false" />
-        <smtp
-            host="smtp-mail.outlook.com"
-            port="587"
-            starttls="true" />
-    </provider>
-    <provider
-        name="Office365"
+        name="Outlook/Office365"
         link="https://support.office.com/en-us/article/pop-imap-and-smtp-settings-for-outlook-com-d088b986-291d-42b8-9564-9c414e2aa040">
         <imap
             host="outlook.office365.com"