From 2182f9728fd74ac7e944d32d41e2f74ef35ce374 Mon Sep 17 00:00:00 2001
From: Sermet Pekin <96650846+SermetPekin@users.noreply.github.com>
Date: Sun, 4 Aug 2024 11:26:30 +0300
Subject: [PATCH] Update conf.py

---
 docs/source/conf.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5298642..c3127d8 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -47,25 +47,23 @@
 # -- Options for HTML output -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
 
-<<<<<<< HEAD
+# <<<<<<< HEAD
 html_theme = 'sphinx_book_theme'  # Theme for HTML output
 html_static_path = ['_static']  # Static files path
 
-=======
-html_static_path = ['static']
+#=======
+#html_static_path = ['static']
 os.makedirs(html_static_path[0])
->>>>>>> f106125c794f7eeb8348e421c7d0ba4b3edee5e1
+#>>>>>>> f106125c794f7eeb8348e421c7d0ba4b3edee5e1
 source_suffix = {
     '.rst': 'restructuredtext',
     '.txt': 'markdown',
     '.md': 'markdown',
 }
 
-<<<<<<< HEAD
+
 from sphinx.util import logging
-=======
 
->>>>>>> f106125c794f7eeb8348e421c7d0ba4b3edee5e1
 logger = logging.getLogger(__name__)
 
 def linkcode_resolve(domain, info):