[riot-commits] [RIOT-OS/RIOT] bbae7a: tests: revert gnrc_netif2 test to resolve merge co...

Hauke Petersen devel at haukepetersen.de
Fri Nov 17 15:50:18 CET 2017


  Branch: refs/heads/gnrc_netif2_integration/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: bbae7a419352aa11d8cc3b65c627d394692eeb93
      https://github.com/RIOT-OS/RIOT/commit/bbae7a419352aa11d8cc3b65c627d394692eeb93
  Author: Martine Lenders <m.lenders at fu-berlin.de>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    A tests/gnrc_netif2/Makefile
    A tests/gnrc_netif2/common.c
    A tests/gnrc_netif2/common.h
    A tests/gnrc_netif2/main.c
    A tests/gnrc_netif2/tests/01-run.py

  Log Message:
  -----------
  tests: revert gnrc_netif2 test to resolve merge conflict


  Commit: 582abd4e003c58d579602adda985fd4b04b04789
      https://github.com/RIOT-OS/RIOT/commit/582abd4e003c58d579602adda985fd4b04b04789
  Author: Hauke Petersen <devel at haukepetersen.de>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    A tests/gnrc_netif2/Makefile
    A tests/gnrc_netif2/common.c
    A tests/gnrc_netif2/common.h
    A tests/gnrc_netif2/main.c
    A tests/gnrc_netif2/tests/01-run.py

  Log Message:
  -----------
  Merge pull request #8075 from miri64/tests/fix/resolve-gnrc_netif2-conflict

tests: revert gnrc_netif2 Makefile to resolve merge conflict


Compare: https://github.com/RIOT-OS/RIOT/compare/abe721ff6c7a...582abd4e003c


More information about the commits mailing list