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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve conflict between master and alpha #2170

Closed
1 task done
Tracked by #246
adamstankiewicz opened this issue Mar 29, 2023 · 0 comments · Fixed by #2204
Closed
1 task done
Tracked by #246

Resolve conflict between master and alpha #2170

adamstankiewicz opened this issue Mar 29, 2023 · 0 comments · Fixed by #2204
Assignees
@viktorrusakov
Labels
raccoon-gang

Comments

@adamstankiewicz
Copy link
Member

adamstankiewicz commented Mar 29, 2023 •
edited by viktorrusakov
Loading

There appears to be a merge conflict on the auto-generated PR to sync alpha with master:

image

Link to sync PR: #2162

Acceptance Criteria
Preview Give feedback
@adamstankiewicz adamstankiewicz added this to the Design tokens with style-dictionary milestone Mar 29, 2023
@viktorrusakov viktorrusakov linked a pull request Apr 21, 2023 that will close this issue
[BD-46] sync alpha branch with master #2204
Merged
10 tasks
@viktorrusakov viktorrusakov self-assigned this Apr 21, 2023
@arbrandes arbrandes mentioned this issue Mar 19, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@viktorrusakov viktorrusakov

Labels
raccoon-gang
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[BD-46] sync alpha branch with master openedx/paragon
2 participants
@adamstankiewicz @viktorrusakov