examples/gnrc_br: revert removal of pca1000x#7986
Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom Nov 9, 2017
Merged
Conversation
Member
|
Is this an actual revert commit? Not sure it works otherwise. |
Contributor
Author
|
nope, just a commit that reverts the change... |
miri64
added
the
CI: ready for build
Member
|
Added this PR to the gnrc_ipv6_nib / gnrc_netif2 Integration project as reminder to re-apply the change after #7925 is merged |
Contributor
Author
|
alright. |
Member
|
(Worked btw 👍) |
Contributor
Author
|
awesome. The rest is up to you :-) And sorry for the inconvenience, did not think about the GNRC merge blockade when touching the examples... |
miri64
added a commit
to miri64/RIOT
that referenced
this pull request
Nov 17, 2017
As in RIOT-OS#7986 this application (obviously) causes a conflict in RIOT-OS#7925 since RIOT-OS#7979. This PR fixes that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
revert the removal of the pca1000x boards from this Makefile to prevent merge conflicts for the gnrc_netif2 integration.
@miri64 promised to remove these entries again once gnrc_netif2 is merged...