Skip to content

Lab/scale sim - #135

Merged
fnyaker merged 3 commits into
mainfrom
lab/scale-sim
Oct 15, 2026
Merged

fnyaker merged 3 commits into
mainfrom
lab/scale-sim

Conversation

@fnyaker

@fnyaker fnyaker commented Oct 14, 2026

Copy link
Copy Markdown
Owner

No description provided.

fnyaker and others added 2 commits October 14, 2026 17:33
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…SE, and the three numbers on the energy bar

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@fnyaker

fnyaker commented Oct 14, 2026

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	BUGSVULNS.MD
#	pyproject.toml

Co-authored-by: fnyaker <76814730+fnyaker@users.noreply.github.com>

Copilot AI commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Done in 254aacd: I merged origin/main into lab/scale-sim and resolved the conflicts in pyproject.toml and BUGSVULNS.MD.

@fnyaker
fnyaker merged commit 2ae231d into main Oct 15, 2026
9 checks passed
@fnyaker
fnyaker deleted the lab/scale-sim branch October 15, 2026 11:26
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