resolved merge conflict #382
Closed
Conversation
This file contains 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
abiona01
requested changes
Jul 23, 2024
package.json
Outdated
| @@ -38,6 +38,7 @@ | |||
| "clsx": "^2.1.1", | |||
| "isbot": "^4.4.0", | |||
| "lucide-react": "^0.408.0", | |||
| "pnpm": "^9.6.0", | |||
There was a problem hiding this comment.
Remove pnpm from the project. You're supposed to install it on your laptop, not in the project
abiona01
requested changes
Jul 23, 2024
Comment on lines
+10398
to
+10412
| "node_modules/pnpm": { | ||
| "version": "9.6.0", | ||
| "resolved": "https://registry.npmjs.org/pnpm/-/pnpm-9.6.0.tgz", | ||
| "integrity": "sha512-ONxvuo26NbOTQLlwARLC/h4S8QsXE0cVpKqYzPe7A152/Zgc8Ls4TfqY+NavVIHCvvL0Jmokv6IMNOtxR84LXg==", | ||
| "bin": { | ||
| "pnpm": "bin/pnpm.cjs", | ||
| "pnpx": "bin/pnpx.cjs" | ||
| }, | ||
| "engines": { | ||
| "node": ">=18.12" | ||
| }, | ||
| "funding": { | ||
| "url": "https://opencollective.com/pnpm" | ||
| } | ||
| }, |
There was a problem hiding this comment.
This too. Don't manually delete. Run pnpm remove pnpm
abiona01
requested changes
Jul 23, 2024
There was a problem hiding this comment.
Why did you delete the lock file?
There was a problem hiding this comment.
just fixed that now
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Closes #issue_number_here
Changes proposed
What were you told to do?
What did you do?
Check List (Check all the applicable boxes)
🚨Please review the contribution guideline for this repository.
Screenshots/Videos