diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2022-07-05 15:27:01 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2022-07-05 15:33:09 +0200 |
| commit | 3169ae5f4716801d7fba7149a02652ed7d7d32b1 (patch) | |
| tree | 0b24fdc1f6d8f7f909fdde104850fedbd7ab6342 | |
| parent | d7cb6444bf1b65f6b990d6e81121d2110e62a57a (diff) | |
Fix merge conflict
Issue-ID: DOC-782
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: Icac37f7c246f9a8e562bf9537ec9c5e9ed408eaf
| -rw-r--r-- | docs/release/releaserepos.rst | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docs/release/releaserepos.rst b/docs/release/releaserepos.rst index a346e3e9e..4902c9627 100644 --- a/docs/release/releaserepos.rst +++ b/docs/release/releaserepos.rst @@ -68,16 +68,9 @@ MULTICLOUD - Multi Cloud OOF - Optimization Framework ---------------------------- -<<<<<<< HEAD (066e8b Add Jakarta Release Note) +- :doc:`optf/has <onap-optf-has:sections/release-notes>` - :ref:`optf/osdf <onap-optf-osdf:release_notes>` -.. enable later -.. - :ref:`optf/has <onap-optf-has:release_notes>` -======= -- :ref:`optf/has <onap-optf-has:release_notes>` -- :ref:`optf/osdf <onap-optf-osdf:release_notes>` ->>>>>>> CHANGE (67ce52 add missing sections to conf.py) - OOM - ONAP Operations Manager ----------------------------- - :ref:`oom <onap-oom:release_notes>` |