Skip to content

Make CI happy again - #2

Open
grische wants to merge 4 commits into
ffbs:v2023.2.x-parkerfrom
grische:fix/make-ci-happy
Open

grische wants to merge 4 commits into
ffbs:v2023.2.x-parkerfrom
grische:fix/make-ci-happy

Conversation

@grische

@grische grische commented Nov 3, 2024

Copy link
Copy Markdown

Mostly making indentation consistent and remove json require from radvd.

I added fixup commits where the fixup was obvious and made new commits where I couldn't identify the source.

See https://github.com/grische/gluon/actions/runs/11651832388

@SmithChart

Copy link
Copy Markdown

please rebase.

@grische

grische commented Nov 27, 2024

Copy link
Copy Markdown
Author

rebased

@SmithChart

SmithChart commented Dec 15, 2024

Copy link
Copy Markdown

@grische Please have a look. "Merging" of #1 seems to have resulted in conflicts here.

@SmithChart
SmithChart force-pushed the v2023.2.x-parker branch 3 times, most recently from 4eecdde to 7bb819a Compare July 26, 2025 17:06
@grische
grische force-pushed the fix/make-ci-happy branch from 091fe30 to 3f5fae6 Compare January 3, 2026 19:21
@grische

grische commented Jan 3, 2026

Copy link
Copy Markdown
Author

@SmithChart sorry for the late reply, I did not have this PR on my radar. It should be mergable again.

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