Fix merge conflicts

2024-08-19 20:50:14 +02:00
parent d8705de26f 3365c099bb
commit a82e074bd4
74 changed files with 1969 additions and 640 deletions
--- a/Wino.Mail/Styles/Colors.xaml
+++ b/Wino.Mail/Styles/Colors.xaml
@@ -9,6 +9,9 @@

    <SolidColorBrush x:Key="FolderSyncBrush">#1abc9c</SolidColorBrush>

+    <SolidColorBrush x:Key="AliasUnverifiedBrush">#ff7675</SolidColorBrush>
+    <SolidColorBrush x:Key="AliasVerifiedBrush">#1abc9c</SolidColorBrush>
+
    <ResourceDictionary.ThemeDictionaries>
        <ResourceDictionary x:Name="Light">
            <SolidColorBrush x:Key="AttachmentBrush">#fdcb6e</SolidColorBrush>