diff options
| author |   CNlucius <lukai1@huawei.com> | 2016-08-11 20:39:50 +0800 |
|---|---|---|
| committer | CNlucius <lukai1@huawei.com> | 2016-08-11 20:41:42 +0800 |
| commit | 930ea9762123eed05c9f824aed6a132f986f126f (patch) | |
| tree | e62925819b7d243d294887d99626d28839f38f03 /docs/Colorado/release/onos-release.rst | |
| parent | 42ee46b5f6f8e85a8967733ad142438f923adaa8 (diff) | |
DOCS-84
ONOSFW contribution to the Colorado user guide
Change-Id: I16dcc5f02e1024de35db9a4a85bdf491f36b4309
Signed-off-by: CNlucius <lukai1@huawei.com>
Diffstat (limited to 'docs/Colorado/release/onos-release.rst')
| -rw-r--r-- | docs/Colorado/release/onos-release.rst | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/Colorado/release/onos-release.rst b/docs/Colorado/release/onos-release.rst index da819842..540dd597 100644 --- a/docs/Colorado/release/onos-release.rst +++ b/docs/Colorado/release/onos-release.rst @@ -1,5 +1,5 @@ ========================================= -OPNFV Brahmaputra release note for onosfw +OPNFV Colorado release note for onosfw ========================================= .. contents:: Table of Contents @@ -14,7 +14,11 @@ This document describes the release note of onosfw project, including upstream p License ======= -OPNFV Brahmaputra release note for onosfw Docs +<<<<<<< HEAD:docs/Colorado/release/onos-release.rst +OPNFV Colorado release note for onosfw Docs +======= +OPNFV Colorado release note for onosfw Docs +>>>>>>> 061216d... DOCS-84:docs/Colorado/release/onos-release.rst (c) by Lucius (HUAWEI) OPNFV Colorado release note for onosfw Docs |