🔀 merge(frontend): resolve merge conflict in reactflowUtils.ts file
🐛 fix(frontend): remove unnecessary merge conflict markers in reactflowUtils.ts file
This commit is contained in:
parent
2f1f3ee9d8
commit
8c2ce3f209
1 changed files with 0 additions and 3 deletions
|
|
@ -232,8 +232,6 @@ export function addVersionToDuplicates(flow: FlowType, flows: FlowType[]) {
|
||||||
|
|
||||||
return newName;
|
return newName;
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
export function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>, inputValue: string | string[] | null, block: string)
|
export function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>, inputValue: string | string[] | null, block: string)
|
||||||
{
|
{
|
||||||
|
|
@ -242,4 +240,3 @@ export function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>, inputVal
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
>>>>>>> bugfix-backctrl
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue