Skip to content

Conversation

eric-schneider
Copy link
Contributor

No description provided.

@eric-schneider eric-schneider requested a review from mlr September 27, 2023 04:26
@eric-schneider eric-schneider self-assigned this Sep 27, 2023
@eric-schneider
Copy link
Contributor Author

@mlr Looks like I pulled in package-lock by accident and have to resolve some merge conflicts.

@mlr
Copy link
Contributor

mlr commented Sep 27, 2023

@mlr Looks like I pulled in package-lock by accident and have to resolve some merge conflicts.

We should remove package-lock from gitignore to ensure everyone has the same dependencies. Since your PR didn’t alter any dependencies it should be safe to use the contents currently on main
Edit: scratch above I see some of the package edits you have. We still should remove package lock from gitignore

@eric-schneider eric-schneider merged commit 6a4186d into main Sep 27, 2023
@eric-schneider eric-schneider deleted the asciidoc-updates branch September 27, 2023 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants