merge master

.github/workflows/doc-build.yaml

@@ -16,8 +16,12 @@ jobs:
         with:
           docs-folder: "src_docs/"
           pre-build-command: |
-            pip install sphinx_rtd_theme
-            pip install furo
+            pip install --upgrade pip
+            pip install sphinx==4.3.2
+            pip install docutils==0.16
+            pip install pygments==2.11.1
+            pip install furo==2022.1.2
+            pip list
           build-command: "sphinx-build -b html ./source ../docs"
 
       - name: Commit documentation changes

src_docs/source/index.rst

@@ -7,11 +7,7 @@ Welcome to GravityMon's documentation!
 ######################################
 
 .. note::
-<<<<<<< HEAD
-  This documentation reflects **v1.0**. Last updated 2022-05-26
-=======
   This documentation reflects **v1.0**. Last updated 2022-07-02
->>>>>>> master
 
 * Docs for: `v0.8 <https://mp-se.github.io/gravitymon/v0.8/index.html>`_
 * Docs for: `v0.9 <https://mp-se.github.io/gravitymon/v0.9/index.html>`_