resolve conflicts
This commit is contained in:
@@ -8,14 +8,6 @@ const Result = ({result, term}) => {
|
|||||||
const [title, setTitle] = useState()
|
const [title, setTitle] = useState()
|
||||||
let sentences
|
let sentences
|
||||||
|
|
||||||
<<<<<<< Updated upstream
|
|
||||||
const checkForMatches = (props) => {
|
|
||||||
if(props.length !== 1) return sentences.map((sentence) => {
|
|
||||||
sentence.toLowerCase().includes(term.toLowerCase()) ? setTitle(sentence) : null
|
|
||||||
})
|
|
||||||
|
|
||||||
return setTitle(text)
|
|
||||||
=======
|
|
||||||
const checkForMatches = (props) => {
|
const checkForMatches = (props) => {
|
||||||
if(props.length === 1) return setTitle(props)
|
if(props.length === 1) return setTitle(props)
|
||||||
if(props.length > 1){
|
if(props.length > 1){
|
||||||
@@ -23,7 +15,6 @@ const Result = ({result, term}) => {
|
|||||||
if(sentence.toLowerCase().includes(term.toLowerCase())) setTitle(sentence)
|
if(sentence.toLowerCase().includes(term.toLowerCase())) setTitle(sentence)
|
||||||
})
|
})
|
||||||
} else setTitle(props[0])
|
} else setTitle(props[0])
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user