Fix main dev conflicts #235
Merged
Conversation
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
Dev site looks good
* added cross-env, simple per-product build * Update readme with new help info * Remove the start-product and start-product-chok as they are the same as start and start-chok * Add note about warning on first run 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Jordan Violet <8886650+jtviolet@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: James Anderson <james.s.anderson@netwrix.com>
jake-mahon
approved these changes
Sep 18, 2025
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.
a merge of dev to main is blocked by conflicts in these two files. This will make the files in dev the same as they are in main and resolve the conflicts. Once we get it merged in we can then make these changes again if we need them.