docs/conf.py: Bringing changes here as build fails otherwise.

Signed-off-by: NikhitaR-IFX <Nikhita.Rajasekhar@infineon.com>
Infineon · Oct 9, 2023 · 806a363 · 806a363
1 parent 12d1389
commit 806a363
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -51,13 +51,7 @@
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
-<<<<<<< HEAD
-<<<<<<< HEAD
     'sphinxcontrib.jquery',
-=======
->>>>>>> docs: Added docs and docs conf for PSoC6 port.
-=======
->>>>>>> docs: Added docs and docs conf for PSoC6 port.
     'sphinx_tabs.tabs',
 ]