diff options
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 |