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

remove conflict detection #1257

Merged
merged 2 commits into from
Mar 28, 2022
Merged

remove conflict detection #1257

merged 2 commits into from
Mar 28, 2022

Conversation

zhen0
Copy link
Member

@zhen0 zhen0 commented Mar 27, 2022

Description

<! -- What is it meant to do? -->

Re-remove conflict detection from fontawesome - somehow this snuck back in after being resolved in #1150

Linked Issues

<! -- Use a key word (e.g. closes or resolves) to close related issues -->

Tests and performance

  • Changes to any .js files are covered by existing tests or this PR adds new tests (if not please explain why below)
  • No new packages are added or package size and performance considerations are discussed below
  • PR Title fits our changelog format

Releases/Changelog cuts only

@znicholasbrown znicholasbrown merged commit a0dd793 into master Mar 28, 2022
@znicholasbrown znicholasbrown deleted the conflict-detect branch March 28, 2022 14:18
@znicholasbrown znicholasbrown mentioned this pull request Apr 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@znicholasbrown znicholasbrown znicholasbrown approved these changes

@stackoverfloweth stackoverfloweth Awaiting requested review from stackoverfloweth

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
@zhen0 @znicholasbrown