Skip to content

Resolve conflict with TEEsim - #76

Merged
beakthoven merged 1 commit into
beakthoven:mainfrom
MeowDump:conflict
Aug 15, 2026
Merged

beakthoven merged 1 commit into
beakthoven:mainfrom
MeowDump:conflict

Conversation

@MeowDump

Copy link
Copy Markdown
Contributor

TEE Simulator's module ID has been changed. As a result, TS-OOS no longer replaces TEE Simulator's module ID with its own

TEE Simulator's module ID has been changed

Signed-off-by: MONA <121730102+MeowDump@users.noreply.github.com>

@beakthoven beakthoven left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

LGTM, thanks

@beakthoven
beakthoven merged commit bc77356 into beakthoven:main Aug 15, 2026
2 checks passed
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