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

chore: remove unnecessary conflicts #33

Merged
merged 1 commit into from
Jul 28, 2023
Merged

chore: remove unnecessary conflicts #33

merged 1 commit into from
Jul 28, 2023

Conversation

amaanq
Copy link
Contributor

@amaanq amaanq commented Jul 27, 2023

image

the-mikedavis
the-mikedavis approved these changes Jul 28, 2023
View reviewed changes
Copy link
Member

@the-mikedavis the-mikedavis left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@the-mikedavis the-mikedavis merged commit 9bf4ae4 into phoenixframework:main Jul 28, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the-mikedavis the-mikedavis the-mikedavis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@amaanq @the-mikedavis