Skip to content

Fix merge conflict resulting from #17602 #18956

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
Closed
bctiemann opened this issue Mar 19, 2025 · 0 comments
Closed

Fix merge conflict resulting from #17602 #18956

bctiemann opened this issue Mar 19, 2025 · 0 comments
Assignees
@bctiemann
Labels
status: accepted This issue has been accepted for implementation type: housekeeping Changes to the application which do not directly impact the end user

Comments

@bctiemann
Copy link
Contributor

Proposed Changes

#17602 introduced a migration conflict (0018_contact_groups, 0018_contactgroup_comments_tenantgroup_comments in tenancy) that needs to be resolved.

Justification

Required for clean build.
@bctiemann bctiemann added the type: housekeeping Changes to the application which do not directly impact the end user label Mar 19, 2025
@bctiemann bctiemann self-assigned this Mar 19, 2025
@bctiemann bctiemann mentioned this issue Mar 19, 2025
Merged
@jeremystretch jeremystretch added the status: accepted This issue has been accepted for implementation label Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@bctiemann bctiemann

Labels
status: accepted This issue has been accepted for implementation type: housekeeping Changes to the application which do not directly impact the end user
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@bctiemann @jeremystretch