mirror of
https://github.com/rowboatlabs/rowboat.git
synced 2026-05-09 15:22:39 +02:00
Fix merge issue
This commit is contained in:
parent
6a1ecf094c
commit
4d005dc93b
1 changed files with 0 additions and 3 deletions
|
|
@ -19,13 +19,10 @@ interface EditableFieldProps {
|
||||||
className?: string;
|
className?: string;
|
||||||
validate?: (value: string) => { valid: boolean; errorMessage?: string };
|
validate?: (value: string) => { valid: boolean; errorMessage?: string };
|
||||||
light?: boolean;
|
light?: boolean;
|
||||||
<<<<<<< HEAD
|
|
||||||
mentions?: boolean;
|
mentions?: boolean;
|
||||||
mentionsAtValues?: Match[];
|
mentionsAtValues?: Match[];
|
||||||
=======
|
|
||||||
showSaveButton?: boolean;
|
showSaveButton?: boolean;
|
||||||
error?: string | null;
|
error?: string | null;
|
||||||
>>>>>>> 0ddd390 (Refactor components and use in scenarios pages)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function EditableField({
|
export function EditableField({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue