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

Update #464

Merged
merged 4 commits into from
Oct 29, 2024
Merged

Update #464

merged 4 commits into from
Oct 29, 2024

Conversation

para0x0dise
Copy link
Contributor

related to #463

@doomedraven
Copy link
Collaborator

I think you should pull first, as now they all have conflicts

@doomedraven
Copy link
Collaborator

i have fixed them for you, soas you can see most of what you did, was already done, please always do git pull before start working on new branch, or pull master to your branch, that saves a lot of time to both of us, + for cmdlines there was missed [] at the end, otherwise is None and for can't iteract it

@doomedraven doomedraven merged commit 9004c15 into CAPESandbox:master Oct 29, 2024
2 checks passed
@para0x0dise
Copy link
Contributor Author

i have fixed them for you, soas you can see most of what you did, was already done, please always do git pull before start working on new branch, or pull master to your branch, that saves a lot of time to both of us, + for cmdlines there was missed [] at the end, otherwise is None and for can't iteract it

Got it
Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants