Skip to content

Commit a62a108

Browse files
committed
fix: Merge conflicts
1 parent c3feddd commit a62a108

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/autosuggest/autosuggest-option.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,9 @@ const AutosuggestOption = (
108108
ref: React.Ref<HTMLDivElement>
109109
) => {
110110
const baseProps = getBaseProps(rest);
111-
<<<<<<< dev-v3-philosr-refactor-4
112-
const useEntered = option.type === 'use-entered';
113-
const isParent = option.type === 'parent';
114-
const isChild = option.type === 'child';
115-
=======
116111
const useEntered = option?.type === 'use-entered';
117112
const isParent = option?.type === 'parent';
118113
const isChild = option?.type === 'child';
119-
>>>>>>> main
120114
const { throughIndex, inGroupIndex, groupIndex } = getTestOptionIndexes(option) || {};
121115

122116
let optionContent;

0 commit comments

Comments
 (0)