aboutsummaryrefslogtreecommitdiffstats
path: root/documentation/mega-manual
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-03-09 13:30:27 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-23 21:56:08 +0000
commit4c5157f7dcfecab3b4e4483cd122e0ae74b377ee (patch)
tree03c0812d79db78ebfd454b540338b66e2dc20521 /documentation/mega-manual
parent4306f7f97a2ea05ebf141947294729584795d832 (diff)
downloadopenembedded-core-contrib-4c5157f7dcfecab3b4e4483cd122e0ae74b377ee.tar.gz
ref-manual: Resolving a conflict
(From yocto-docs rev: b364516928d04da38ef3188f07f190ffac64762b) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/mega-manual')
-rw-r--r--documentation/mega-manual/figures/app-dev-flow.pngbin52670 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/documentation/mega-manual/figures/app-dev-flow.png b/documentation/mega-manual/figures/app-dev-flow.png
deleted file mode 100644
index 4927b93d67..0000000000
--- a/documentation/mega-manual/figures/app-dev-flow.png
+++ /dev/null
Binary files differ