From 930ea9762123eed05c9f824aed6a132f986f126f Mon Sep 17 00:00:00 2001 From: CNlucius Date: Thu, 11 Aug 2016 20:39:50 +0800 Subject: DOCS-84 ONOSFW contribution to the Colorado user guide Change-Id: I16dcc5f02e1024de35db9a4a85bdf491f36b4309 Signed-off-by: CNlucius --- docs/Colorado/release/onos-release.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/Colorado/release/onos-release.rst') 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 -- cgit 1.2.3-korg