tests: revert gnrc_netif2 Makefile to resolve merge conflict#8075
Merged
haukepetersen merged 1 commit intoRIOT-OS:gnrc_netif2_integration/masterfrom Nov 17, 2017
Conversation
miri64
added
GNRC
Area: network
miri64
added
the
CI: ready for build
Member
Author
|
I adapted the test to the renaming now so it should compile now ;-) |
miri64
force-pushed
the
tests/fix/resolve-gnrc_netif2-conflict
branch
from
4d78784 to
bbae7a4
Compare
haukepetersen
approved these changes
Nov 17, 2017
Contributor
haukepetersen
left a comment
haukepetersen
left a comment
There was a problem hiding this comment.
Discussed offline and I agree to this: ACK
Contributor
|
and go. |
Member
Author
|
Thanks! |
Contributor
|
youre welcome :-) |
Member
Author
|
(Put this into TODO, so I remember to remove this again, once #7925 is merged) |
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
4 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.
Not sure this does work, but I'm a little desperate now. If it doesn't work we still can reset it back to the commits parent in
gnrc_netif2_integration/masteras I did with #8074.