From ea7b27f9125793d901143cff1661451a1fafdc06 Mon Sep 17 00:00:00 2001
From: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:18:43 +0900
Subject: [PATCH] fix merge failure

---
 packages/frontend/src/preferences/def.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 048392ef49..2bcd4540bf 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -216,6 +216,9 @@ export const PREF_DEF = {
 		default: 3,
 	},
 	emojiPickerStyle: {
+		default: 'auto' as 'auto' | 'popup' | 'drawer' | 'window',
+	},
+	reactionPickerStyle: {
 		default: 'auto' as 'auto' | 'popup' | 'drawer',
 	},
 	squareAvatars: {