fix: resolve merge conflict artifacts in 4 page files (closes #256)#258
Open
Siddh2024 wants to merge 8 commits into
Open
fix: resolve merge conflict artifacts in 4 page files (closes #256)#258Siddh2024 wants to merge 8 commits into
Siddh2024 wants to merge 8 commits into
Conversation
Nsanjayboruds
left a comment
Nsanjayboruds
left a comment
Owner
There was a problem hiding this comment.
sloved the frontend lint issue
…dh2024/RIVETO into fix/merge-conflict-artifacts
…issing wishlist states in ShopContext
Nsanjayboruds
approved these changes
Jun 10, 2026
|
|
||
| useEffect(() => { | ||
| if (!isLoading && bestsellers.length > 0 && gridRef.current) { | ||
| gsap.fromTo( |
Owner
There was a problem hiding this comment.
Unexpected console statement
Continuous Integration / Lint Frontend
Owner
There was a problem hiding this comment.
Unexpected console statement
Continuous Integration / Lint Frontend
|
|
||
| useEffect(() => { | ||
| getProducts(); | ||
| }, []); |
Owner
There was a problem hiding this comment.
Unexpected console statement
Continuous Integration / Lint Frontend
Owner
There was a problem hiding this comment.
Unexpected console statement
Contributor
Author
|
@Nsanjayboruds , check this resolve |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Resolves merge conflict artifacts left in 4 page files after an incomplete conflict resolution. The original conflict markers were removed but the necessary imports were lost.
Changes Made
Recommendations.jsx
NewArrivals.jsx
BestSellers.jsx
NotFound.jsx
Closes #256