Solve conflicts

cs107-undefined · Dec 10, 2021 · f088d13 · f088d13
2 parents 95873d7 + 0d11aec
commit f088d13
Show file tree

Hide file tree

Showing 120 changed files with 1,064 additions and 939 deletions.
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -17,7 +17,7 @@ build:
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
-   configuration: docs/conf.py
+   configuration: docs/documentation/conf.py
 
 # If using Sphinx, optionally build your docs in additional formats such as PDF
 # formats:
@@ -26,4 +26,4 @@ sphinx:
 # Optionally declare the Python requirements required to build your docs
 python:
    install:
-   - requirements: requirements.txt
+   - requirements: requirements.txt
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,9 @@
 language: python
 python:
-  - "3.6"
+  - "3.8"
 before_install:
   - pip install codecov
   - pip install coverage
-  - pip install networkx
 
 script:
   - coverage run --source=undefined -m unittest test/test_*.py

diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 # cs107-FinalProject
 
-[![Build Status](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject.svg?branch=milestone2)](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject)
+[![Build Status](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject.svg?branch=final_milestone)](https://app.travis-ci.com/cs107-undefined/cs107-FinalProject)
 
-[![codecov](https://codecov.io/gh/cs107-undefined/cs107-FinalProject/branch/milestone2/graph/badge.svg?token=MWEZONI94C)](https://codecov.io/gh/cs107-undefined/cs107-FinalProject)
+[![codecov](https://codecov.io/gh/cs107-undefined/cs107-FinalProject/branch/final_milestone/graph/badge.svg?token=MWEZONI94C)](https://codecov.io/gh/cs107-undefined/cs107-FinalProject)
+
+[![Documentation Status](https://readthedocs.org/projects/cs107-undefined/badge/?version=latest)](https://cs107-undefined.readthedocs.io/en/latest/?badge=latest)
 
 [**DOCUMENTATION**](https://cs107-undefined.readthedocs.io/en/latest/)
 

diff --git a/docs/_build/doctrees/organization.doctree b/docs/_build/doctrees/organization.doctree
diff --git a/docs/_build/html/_sources/organization.rst.txt b/docs/_build/html/_sources/organization.rst.txt