Skip to content

Merge pull request #18 from Univers42/copilot/fix-linting-phase-failure - #19

Merged
LESdylan merged 4 commits into
mainfrom
develop
Oct 17, 2026
Merged

LESdylan merged 4 commits into
mainfrom
develop

Conversation

@SMOSTAFAH1

Copy link
Copy Markdown
Member

No description provided.

@LESdylan

Copy link
Copy Markdown
Member

@SMOSTAFAH1 please resolved the confclits

@SMOSTAFAH1

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts on this branch.

# Conflicts:
#	tests/test_host_port_bind.sh

Co-authored-by: SMOSTAFAH1 <131867400+SMOSTAFAH1@users.noreply.github.com>

Copilot AI commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts on this branch.

Conflicts are resolved on this branch by merging origin/main into develop and fixing the tests/test_host_port_bind.sh conflict in commit e8a4c22.

@SMOSTAFAH1
SMOSTAFAH1 requested a review from LESdylan October 17, 2026 17:53
@LESdylan
LESdylan merged commit 54f378f into main Oct 17, 2026
4 checks passed
@SMOSTAFAH1
SMOSTAFAH1 deleted the develop branch October 17, 2026 18:30
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.

3 participants