Fix merge conflicts

Remove sphinx docs
yaph · Nov 18, 2020 · fe93603 · fe93603
1 parent bbd45eb
commit fe93603
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 855 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,4 @@
 public/
-<<<<<<< HEAD
-t/
-MANIFEST
-=======
->>>>>>> v5
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

diff --git a/docs/Makefile b/docs/Makefile
diff --git a/docs/_static/logya.png b/docs/_static/logya.png
diff --git a/docs/_templates/footer.html b/docs/_templates/footer.html