Merged conflicts

This commit is contained in:
Hernan Grecco 2015-12-21 23:54:54 -03:00
commit bdd349cc9e
2 changed files with 3 additions and 4 deletions

2
README
View File

@ -11,7 +11,7 @@ and constants. Due to its modular design, you to extend (or even rewrite!)
the complete list without changing the source code.
It has a complete test coverage. It runs in Python 2.7 and 3.X
with no other dependency. It licensed under BSD.
with no other dependency. It is licensed under BSD.
Design principles

View File

@ -17,8 +17,7 @@ without changing the source code. It supports a lot of numpy mathematical
operations **without monkey patching or wrapping numpy**.
It has a complete test coverage. It runs in Python 2.6+ and 3.2+ with no other
dependency. It licensed under BSD.
dependency. It is licensed under BSD.
Design principles
-----------------
@ -109,4 +108,4 @@ One last thing
.. _`comprehensive list of physical units, prefixes and constants`: https://github.com/hgrecco/pint/blob/master/pint/default_en.txt
.. _`uncertainties package`: https://pythonhosted.org/uncertainties/
.. _`NumPy`: http://www.numpy.org/
.. _`PEP 3101`: https://www.python.org/dev/peps/pep-3101/
.. _`PEP 3101`: https://www.python.org/dev/peps/pep-3101/