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

chore: Remove the "Design System Package" term for Uno DSP (backport #695) #696

Merged
merged 2 commits into from
May 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 24, 2024

Removing the "Design System Package" term for Uno DSP.
Related issue: https://github.com/unoplatform/private/issues/442


This is an automatic backport of pull request #695 done by Mergify.

(cherry picked from commit 6e83206)

# Conflicts:
#	src/Uno.Templates/content/unoapp/.template.config/template.json
@mergify mergify bot added the conflicts label May 24, 2024
Copy link
Author

mergify bot commented May 24, 2024

Cherry-pick of 6e83206 has failed:

On branch mergify/bp/release/stable/5.2/pr-695
Your branch is up to date with 'origin/release/stable/5.2'.

You are currently cherry-picking commit 6e83206.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/Uno.Templates/content/unoapp/.template.config/template.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@agneszitte agneszitte enabled auto-merge May 24, 2024 15:56
@agneszitte agneszitte merged commit e77816f into release/stable/5.2 May 24, 2024
49 checks passed
@agneszitte agneszitte deleted the mergify/bp/release/stable/5.2/pr-695 branch May 24, 2024 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant