Fix merge conflicts

2024-06-13 01:42:19 +02:00
parent c3fe72f561 4c080360a7
commit 1bf86e73a7
31 changed files with 484 additions and 33 deletions
--- a/Wino.Core.Domain/Entities/MailAccount.cs
+++ b/Wino.Core.Domain/Entities/MailAccount.cs
@@ -44,6 +44,11 @@ namespace Wino.Core.Domain.Entities
        /// </summary>
        public string AccountColorHex { get; set; }

+        /// <summary>
+        /// Gets or sets the listing order of the account in the accounts list.
+        /// </summary>
+        public int Order { get; set; }
+
        /// <summary>
        /// Gets or sets whether the account has any reason for an interactive user action to fix continue operating.
        /// </summary>