Fixed merge conflicts

This commit is contained in:
dherrada 2019-12-27 22:30:41 -05:00 committed by GitHub
parent 5917bc33f6
commit 8df8693494
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -26,12 +26,8 @@ This is easily achieved by downloading
`the Adafruit library and driver bundle <https://github.com/adafruit/Adafruit_CircuitPython_Bundle>`_.
Installing from PyPI
<<<<<<< HEAD
--------------------
=======
====================
>>>>>>> 433e05190968d94b84de07a2b057e3898ec67dd1
On supported GNU/Linux systems like the Raspberry Pi, you can install the driver locally `from
PyPI <https://pypi.org/project/adafruit-circuitpython-am2320/>`_. To install for current user: