Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Conflicts in Your Package.json #5

Closed
manufacturedba opened this issue Jul 25, 2020 · 2 comments
Closed

Merge Conflicts in Your Package.json #5

manufacturedba opened this issue Jul 25, 2020 · 2 comments
Assignees
@cm45t3r
Labels
bug solved

Comments

@manufacturedba
Copy link

Had issues installing directly from trunk. Saw you had some leftovers from a merge

<<<<<<< HEAD
=======
@cm45t3r cm45t3r self-assigned this Aug 21, 2020
@cm45t3r
Copy link
Owner

cm45t3r commented Aug 21, 2020

Hi @manufacturedba thanks for reporting.

cm45t3r pushed a commit that referenced this issue Jan 12, 2021
fix(package): solve merge conflicts in package.json #5
56d87eb 
Fix unresolved merge conflicts in package.json.
Remove .snyk configuration file solving merge conflicts.
Improve general package.json quality and upgrade deps.
It solves issue #1 too.
@cm45t3r
Copy link
Owner

cm45t3r commented Jan 12, 2021

Fixed by 56d87eb

@cm45t3r cm45t3r closed this as completed Jan 12, 2021
@cm45t3r cm45t3r added solved and removed help wanted labels Apr 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@cm45t3r cm45t3r

Labels
bug solved
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@manufacturedba @cm45t3r