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.

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

Already on GitHub? Sign in to your account

Update from main (production) #1410

Merged
merged 6 commits into from
Aug 20, 2024
Merged

Update from main (production) #1410

merged 6 commits into from
Aug 20, 2024

Conversation

github-actions[bot]
Copy link

This is an automated pull request to update from branch main

Vladyslav Tymofeiev and others added 3 commits August 16, 2024 17:21
Copy link
Author

Checking git merge conflicts against https://github.com/openedx/edx-platform.git

Comparing with open-release/nutmeg.master
Benchmark conflicts with prod 301
Current conflicts 301
Summary Good work! No added conflicts.
New conflicting files with 'open-release/nutmeg.master'
lms/static/sass/shared-v2/_base.scss
Comparing with master
Benchmark conflicts with prod 331
Current conflicts 331
Summary Good work! No added conflicts.
New conflicting files with 'master'
lms/static/sass/shared-v2/_base.scss

@VladyslavTy VladyslavTy merged commit 2aa1ec0 into prod Aug 20, 2024
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant