summaryrefslogtreecommitdiffstats
path: root/docs/release/releaserepos.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/releaserepos.rst')
-rw-r--r--docs/release/releaserepos.rst9
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>`