TF-3480 Fix conflict when rebase master
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -19,7 +19,7 @@ class ComposerCache with EquatableMixin {
|
||||
this.email,
|
||||
this.hasRequestReadReceipt,
|
||||
this.isMarkAsImportant,
|
||||
this.displayMode = ScreenDisplayMode.normal
|
||||
this.displayMode = ScreenDisplayMode.normal,
|
||||
this.composerIndex,
|
||||
this.composerId,
|
||||
});
|
||||
@@ -33,7 +33,7 @@ class ComposerCache with EquatableMixin {
|
||||
email,
|
||||
hasRequestReadReceipt,
|
||||
isMarkAsImportant,
|
||||
displayMode
|
||||
displayMode,
|
||||
composerIndex,
|
||||
composerId,
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user