Skip to content

Commit

Permalink
conflict해결
Browse files Browse the repository at this point in the history
  • Loading branch information
0seo8 committed Oct 15, 2022
2 parents 46005c2 + 7d113a9 commit 9b54d21
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions public/assets/category-on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/components/Liked/RecentView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ function RecentView() {
isError,
} = useGetSimpleProductsQuery(queryString)
console.log(recentList)

return (
<div>
<Category />
Expand Down
3 changes: 2 additions & 1 deletion src/components/My/QnAWrite/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ const index = () => {
formData.append(key, userValue[key])
}
}
addQuestion(formData)
// addQuestion(formData)
addQuestion(userValue)
}

const removeThumbnail = (idx) => {
Expand Down

0 comments on commit 9b54d21

Please sign in to comment.