This repository has been archived by the owner on Dec 6, 2022. It is now read-only.
Update Demo Dependencies #20
Merged
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
upgrade to latest pxblue and security issues
Feature/publishing
Update fonts and themes
Update react demo dependencies
Update angular theme
|
Not sure how we ended up with merge conflicts between dev and master, but these conflicts are only in the react-demo folder, so not package-specific. |
|
In this situation, I had to resolve the merge conflicts in a new feature branch To verify that everything is okay, if you try to merge dev into the temp feature branch, there will be no applicable changes. |
joebochill
approved these changes
Mar 31, 2021
jeffvg
approved these changes
Mar 31, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Changes proposed in this Pull Request: