Fixed merge conflicts

Author: evaherrada

.github/workflows/build.yml

@@ -40,14 +40,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-<<<<<<< Updated upstream
         pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
-=======
-        sudo apt-get install -y gettext
-        pip install -r requirements.txt
-        pip install circuitpython-build-tools Sphinx sphinx-rtd-theme
-        pip install pylint
->>>>>>> Stashed changes
     - name: Library version
       run: git describe --dirty --always --tags
     - name: PyLint