Code

Fix merge conflict to fix build#9834

Code

Merged

woody-apple merged 1 commit intoproject-chip:masterproject-chip/connectedhomeip:masterfrom bzbarsky-apple:fix-buildbzbarsky-apple/connectedhomeip:fix-buildCopy head branch name to clipboardSep 20, 2021

+1-1

Commits

Commits on Sep 20, 2021

• Fix merge conflict to fix build

  bzbarsky-apple

  committed
  f75b18f