Skip to content

Add bi2a-iidx support for aciotest#263

Merged
icex2 merged 5 commits intodjhackersdev:masterfrom
MatryoshkaLJY:master
Oct 18, 2023
Merged

Add bi2a-iidx support for aciotest#263
icex2 merged 5 commits intodjhackersdev:masterfrom
MatryoshkaLJY:master

Conversation

@MatryoshkaLJY
Copy link
Copy Markdown
Contributor

No description provided.

Comment thread src/main/aciotest/main.c Outdated
Comment thread src/main/aciotest/main.c
Copy link
Copy Markdown
Contributor

@icex2 icex2 left a comment

Choose a reason for hiding this comment

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

Looking good, thanks for following up on the suggestion.

@icex2
Copy link
Copy Markdown
Contributor

icex2 commented Oct 14, 2023

"This branch cannot be rebased due to conflicts"

Not sure where the conflicts are. It doesn't mention any specific files. Can you check on your end if you are up to date with djhackersdev:master and fix that if needed?

Otherwise, I can't merge it.

@icex2 icex2 merged commit 13c87ea into djhackersdev:master Oct 18, 2023
@icex2
Copy link
Copy Markdown
Contributor

icex2 commented Oct 18, 2023

Thanks for following up. Merged.

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