Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[shopsys] unified composer conflicts #3082

Merged
merged 1 commit into from Mar 27, 2024
Merged

[shopsys] unified composer conflicts #3082

merged 1 commit into from Mar 27, 2024

Conversation

TomasLudvik
Copy link
Member

@TomasLudvik TomasLudvik commented Mar 26, 2024 •
edited by github-actions bot

Q A
Description, the reason for the PR We were using the wrong conflict in composer.json so we fixed that and updated operators to the latest version.
New feature No
BC breaks No
Fixes issues ...
Have you read and signed our License Agreement for contributions? Yes

馃寪 Live Preview:

@TomasLudvik TomasLudvik added the Bug Something isn't working label Mar 26, 2024
@TomasLudvik TomasLudvik force-pushed the tl-unified-composer-conflicts branch from 109703b to ce29877 Compare March 26, 2024 14:55
@vitek-rostislav vitek-rostislav merged commit 22f0351 into 14.0 Mar 27, 2024
17 checks passed
@vitek-rostislav vitek-rostislav deleted the tl-unified-composer-conflicts branch March 27, 2024 08:14
TomasLudvik added a commit that referenced this pull request Mar 27, 2024
@TomasLudvik
[shopsys] unified composer conflicts (#3082)
a4b1e82
sebaholesz pushed a commit that referenced this pull request Mar 27, 2024
@TomasLudvik @sebaholesz
[shopsys] unified composer conflicts (#3082)
43a139c
sebaholesz pushed a commit that referenced this pull request Mar 28, 2024
@TomasLudvik @sebaholesz
[shopsys] unified composer conflicts (#3082)
98dca5e
sebaholesz pushed a commit that referenced this pull request Apr 2, 2024
@TomasLudvik @sebaholesz
[shopsys] unified composer conflicts (#3082)
58ae7a3
sebaholesz pushed a commit that referenced this pull request Apr 5, 2024
@TomasLudvik @sebaholesz
[shopsys] unified composer conflicts (#3082)
39c32b8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vitek-rostislav vitek-rostislav vitek-rostislav approved these changes

Assignees
No one assigned
Labels
Bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@TomasLudvik @vitek-rostislav