From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 5 Jul 2022 13:27:01 +0000 (+0200)
Subject: Fix merge conflict
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F129790%2F2;p=doc.git

Fix merge conflict

Issue-ID: DOC-782
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: Icac37f7c246f9a8e562bf9537ec9c5e9ed408eaf
---

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>`