Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix iOS CHIPTool build. #6514

Merged
merged 1 commit into from
May 6, 2021

Conversation

bzbarsky-apple
Copy link
Contributor

This is due to a merge conflict between PR #6233 nd PR #6442. The
completion handlers got renamed to response handlers in the latter,
but the former is still calling one of them completionHandler.

Problem

iOS CHIPTool does not build.

Summary of Changes

Make it build

This is due to a merge conflict between PR project-chip#6233 nd PR project-chip#6442.  The
completion handlers got renamed to response handlers in the latter,
but the former is still calling one of them completionHandler.
@woody-apple woody-apple added the hotfix urgent fix needed, can bypass review label May 5, 2021
@andy31415
Copy link
Contributor

Force merge bypassing the Unit/Integration test reporting

@andy31415 andy31415 merged commit 0ae199a into project-chip:master May 6, 2021
@bzbarsky-apple bzbarsky-apple deleted the fix-chip-tool-ios branch May 6, 2021 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
darwin hotfix urgent fix needed, can bypass review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants