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

fix: error on merge conflict marker #600

Merged
merged 2 commits into from
Jan 13, 2024
Merged

fix: error on merge conflict marker #600

merged 2 commits into from
Jan 13, 2024

Conversation

magic-akari
Copy link
Contributor

@CLAassistant
Copy link

CLAassistant commented Jan 12, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@magic-akari
Copy link
Contributor Author

How and where can I write test files?

@dsherret
Copy link
Member

Down here for these ones:

dprint-plugin-typescript/src/swc.rs

Line 102 in 52d2c91

mod tests {

Thanks! I'm going to sleep right now so I will look in the morning.

dsherret
dsherret approved these changes Jan 13, 2024
View reviewed changes
Copy link
Member

@dsherret dsherret left a comment

Choose a reason for hiding this comment

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

Looks great. Thanks!

@dsherret dsherret merged commit 7188b60 into dprint:main Jan 13, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dsherret dsherret dsherret 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.

Format breaks file with merge conflict
3 participants
@magic-akari @CLAassistant @dsherret