Solving merge conflicts with master #30
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
* Update README.md: Add information about releases and versioning * COMOPS-908: Updating compatibility with the BIC doc generator (#25) * EQPS-477: SVC Enhancements (#26) * EQPS-477: Dynamically set the correct path for autoload.php based on the location of the ‘vendor’ folder * EQPS-477: Make zend-stdlib a required dependency Co-authored-by: Peter Dohogne <pdohogne@adobe.com>
roribio approved these changes Mar 2, 2020
magento-devops-reposync-svc pushed a commit that referenced this pull request Dec 9, 2021
…mposer Add support php 8.1 to `magento/semver`
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.
Description
Master had a PR merged without going through develop, causing them to diverge. This PR solves the resulting merge conflict.
Contribution checklist