diff options
author | Scott Rifenbark <srifenbark@gmail.com> | 2016-03-15 11:31:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-23 21:56:07 +0000 |
commit | 32629e01d674e1b221049e7c725b35ff5dab39c1 (patch) | |
tree | db80ac623dc3d8d5f79d2711630b5540fa1d614d /documentation/mega-manual | |
parent | af40e9a315e84840f8743a18003df17fe9d57f51 (diff) | |
download | poky-32629e01d674e1b221049e7c725b35ff5dab39c1.tar.gz |
Makefile: Resolving a conflict
(From yocto-docs rev: 221b8eeee23841395b6323da0893156346dead6f)
Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/mega-manual')
0 files changed, 0 insertions, 0 deletions