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

File not merged properly[BUG] #32

Open
ha2san opened this issue Mar 21, 2022 · 1 comment
Open

File not merged properly[BUG] #32

ha2san opened this issue Mar 21, 2022 · 1 comment
Assignees
Labels
bug Something isn't working

Comments

@ha2san
Copy link

ha2san commented Mar 21, 2022

It seems that the script retrowrite was not merged properly

<<<<<<< HEAD

@ha2san ha2san added analysis-needed This issue needs analysis and possible research to solve. bug Something isn't working labels Mar 21, 2022
@ha2san ha2san changed the title [BUG] File not merged properly[BUG] Mar 21, 2022
@diagprov diagprov self-assigned this Mar 23, 2022
@diagprov diagprov removed the analysis-needed This issue needs analysis and possible research to solve. label Mar 23, 2022
@diagprov
Copy link
Contributor

Thanks, will fix. I will also commit my usual incomplete-merge-detection-scripts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants