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

Restyle Show QR code vendor tags in Android app #1492

Closed
wants to merge 2 commits into from

Conversation

restyled-io[bot]
Copy link
Contributor

@restyled-io restyled-io bot commented Jul 8, 2020

A duplicate of #1491 with additional commits that automatically address
incorrect style, created by Restyled.

Since the original Pull Request was opened as a fork in a contributor's
repository, we are unable to create a Pull Request branching from it with only
the style fixes.

The following Restylers made fixes:

  • clang-format

To incorporate these changes, you can either:

  1. Merge this Pull Request instead of the original, or

  2. Ask your contributor to locally incorporate these commits and push them to
    the original Pull Request

    Expand for example instructions
    ```console
    git remote add upstream https://github.com/project-chip/connectedhomeip.git
    git fetch upstream pull/<this PR number>/head
    git merge --ff-only FETCH_HEAD
    git push
    ```
    

NOTE: As work continues on the original Pull Request, this process will
re-run and update (force-push) this Pull Request with updated style fixes as
necessary. If the style is fixed manually at any point (i.e. this process finds
no fixes to make), this Pull Request will be closed automatically.

Sorry if this was unexpected. To disable it, see our documentation.

@CLAassistant
Copy link

CLAassistant commented Jul 8, 2020

CLA assistant check
All committers have signed the CLA.

@restyled-io restyled-io bot closed this Jul 8, 2020
@restyled-io restyled-io bot deleted the restyled/pull-1491 branch July 8, 2020 01:40
jmartinez-silabs added a commit to SiliconLabs/matter that referenced this pull request Jan 18, 2024
…o avoid OT-libs build args in wifi builds.

Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3

Squashed commit of the following:

commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559
Author: Junior Martinez <[email protected]>
Date:   Mon Jan 15 10:08:41 2024 -0500

    Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
jmartinez-silabs added a commit to SiliconLabs/matter that referenced this pull request Feb 15, 2024
…o avoid OT-libs build args in wifi builds.

Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3

Squashed commit of the following:

commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559
Author: Junior Martinez <[email protected]>
Date:   Mon Jan 15 10:08:41 2024 -0500

    Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
jmartinez-silabs added a commit to SiliconLabs/matter that referenced this pull request May 8, 2024
…o avoid OT-libs build args in wifi builds.

Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3

Squashed commit of the following:

commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559
Author: Junior Martinez <[email protected]>
Date:   Mon Jan 15 10:08:41 2024 -0500

    Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
rcasallas-silabs pushed a commit to rcasallas-silabs/connectedhomeip that referenced this pull request Jun 20, 2024
…o avoid OT-libs build args in wifi builds.

Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3

Squashed commit of the following:

commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559
Author: Junior Martinez <[email protected]>
Date:   Mon Jan 15 10:08:41 2024 -0500

    Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
rcasallas-silabs pushed a commit to rcasallas-silabs/connectedhomeip that referenced this pull request Jun 20, 2024
…o avoid OT-libs build args in wifi builds.

Merge in WMN_TOOLS/matter from ot-lib_release to RC_2.3.0-1.3

Squashed commit of the following:

commit 775ab02ce0b85fb5fd558ec68cac8e2b9ba30559
Author: Junior Martinez <[email protected]>
Date:   Mon Jan 15 10:08:41 2024 -0500

    Add a condition in the build script to avoid OT-libs build args in wifi builds. Re-add --use_ot_lib in Pipeline for the 4187C release build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants