summaryrefslogtreecommitdiffstats
path: root/documentation/toaster-manual/toaster-manual.xml
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2017-08-21 12:56:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-02 00:52:56 +0100
commit3e9605bd983b6863d90dc33097e19d7c5e7af51d (patch)
tree462fbac18a30cd7d693418d79592d64f0360cad0 /documentation/toaster-manual/toaster-manual.xml
parent543337e8492059291a22472db86593606922bf11 (diff)
downloadpoky-3e9605bd983b6863d90dc33097e19d7c5e7af51d.tar.gz
ref-manual: Fixed YP Term problem with botched earlier commit
I was cherry-picking in commits from master to pyro and had a conflict that I did not go far enough to the bottom of the file to see the true nature, which was duplication of the "Yocto Project Terms" section. When I resolved the conflit I just took out the top couple lines and actually left the duplicated terms section in. Then I pushed everthing. I should have made the manuals first and I would have discovered the error. This commit fixes it. (From yocto-docs rev: 0a9a7303fc048b59e5328a9855f8615a042ab411) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/toaster-manual/toaster-manual.xml')
0 files changed, 0 insertions, 0 deletions