From 770975aa8e6562546509455cbccb80e9fbda36fc Mon Sep 17 00:00:00 2001
From: Diman0 <diman@huisman.xyz>
Date: Wed, 21 Jul 2021 12:18:14 +0200
Subject: [PATCH] Added missing extension in conf.py. Added missing library in
 requirements.txt. Sphinx is only compatible with docutils<0.17

(cherry picked from commit 64bf75efb1d97771bf7cb8ad5319d0c130b2605a)

# Conflicts:
#	docs/requirements.txt
---
 docs/requirements.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 56a54f27..d4745f49 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,5 +1,13 @@
+<<<<<<< HEAD
 recommonmark==0.7.1
 Sphinx==7.3.7
 sphinx-autobuild==2024.4.16
 sphinx-rtd-theme==2.0.0
 docutils==0.20.1
+=======
+recommonmark
+Sphinx
+sphinx-autobuild
+sphinx-rtd-theme
+docutils==0.16
+>>>>>>> 64bf75ef (Added missing extension in conf.py. Added missing library in requirements.txt. Sphinx is only compatible with docutils<0.17)