merge resolving

2021-01-05 11:35:23 -05:00
parent b62b1166dc
commit 2fcc99cccf
2 changed files with 2 additions and 2 deletions
--- a/app/models/chat_conversation_account.rb
+++ b/app/models/chat_conversation_account.rb
@@ -12,7 +12,7 @@
 #  is_approved                    :boolean          default(FALSE), not null
 #  created_at                     :datetime         not null
 #  updated_at                     :datetime         not null
-#  unread_count                   :bigint(8)        default(0)
+#  unread_count                   :bigint(8)        default(0), not null
 #  chat_message_expiration_policy :string
 #  is_muted                       :boolean          default(FALSE), not null
 #