fix merge failure
This commit is contained in:
parent
859fc943af
commit
ea7b27f912
|
@ -216,6 +216,9 @@ export const PREF_DEF = {
|
||||||
default: 3,
|
default: 3,
|
||||||
},
|
},
|
||||||
emojiPickerStyle: {
|
emojiPickerStyle: {
|
||||||
|
default: 'auto' as 'auto' | 'popup' | 'drawer' | 'window',
|
||||||
|
},
|
||||||
|
reactionPickerStyle: {
|
||||||
default: 'auto' as 'auto' | 'popup' | 'drawer',
|
default: 'auto' as 'auto' | 'popup' | 'drawer',
|
||||||
},
|
},
|
||||||
squareAvatars: {
|
squareAvatars: {
|
||||||
|
|
Loading…
Reference in New Issue