chore: resolved conflicts

2026-01-29 19:55:13 +05:30
parent 933bc58264 a9a322c9af
commit 62631daafb
40 changed files with 2125 additions and 1214 deletions
--- a/frontend/src/components/Controls/Uploader.vue
+++ b/frontend/src/components/Controls/Uploader.vue
@@ -72,7 +72,7 @@ const emit = defineEmits<{

 const props = withDefaults(
 	defineProps<{
-		modelValue: string
+		modelValue: string | null
 		label?: string
 		description?: string
 		type?: 'image' | 'video'