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

Remove git conflicts from admin-index.css #63

Merged

Conversation

dariomory
Copy link
Contributor

@dariomory dariomory commented Jan 31, 2022

Fixes #46

@dariomory dariomory self-assigned this Jan 31, 2022
@dariomory dariomory added the bug label Jan 31, 2022
@joeribekker joeribekker merged commit a714a32 into master Feb 1, 2022
@joeribekker joeribekker deleted the feature/46-admin-index.css-contains-conflict-markers branch February 1, 2022 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

admin-index.css contains conflict markers in version 1.4.0
2 participants