[OE-core] [PATCH 0/1] grub/grub-efi: fix conflict

[Hongxu Jia]

The following changes since commit 43e652f3d1fee5ce7fad67e6400315eab1b34270:

  devtool: add "rename" subcommand (2016-11-07 11:04:22 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib hongxu/fix-grub
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=hongxu/fix-grub

Hongxu Jia (1):
  grub/grub-efi: fix conflict

 meta/recipes-bsp/grub/grub-efi_2.00.bb | 12 +++++++++---
 meta/recipes-bsp/grub/grub2.inc        |  4 ----
 meta/recipes-bsp/grub/grub_2.00.bb     | 18 +++++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

-- 
2.8.1