Fix merge issues between dev and main #552
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
merge to main
* docs: Improve syntax highlighting in README (#524) * fix: added Automatic-Module-Name to MANIFEST.MF * Documentation update for App token provider * Improvements and bug fixes for regional endpoint support (#535) * Improvements and bug fixes for regional endpoint support * Add links to region documentation * Address code review comments * Allow interactive request timeout to be configurable (#536) * Allow interactive request timeout to be configurable * Address code review comments * Address code review comments * Revert accidental commit to dev branch This reverts commit 5bca22f. * Version updates for 1.13.1 release (#537) Co-authored-by: Valery Yatsynovich <[email protected]> Co-authored-by: Erwin Dupont <[email protected]> Co-authored-by: Siddhi <[email protected]>
…ation-library-for-java into avdunn/fix-merge-conflicts � Conflicts: � README.md � bnd.bnd � msal4j-sdk/changelog.txt � msal4j-sdk/src/samples/msal-b2c-web-sample/pom.xml � msal4j-sdk/src/samples/msal-obo-sample/pom.xml � msal4j-sdk/src/samples/msal-web-sample/pom.xml � pom.xml
siddhijain
approved these changes
Oct 7, 2022
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.
No description provided.