comparison tests/conftest.py @ 838:89a44af17062

Merge changes.
author Ludovic Chabant <ludovic@chabant.com>
date Sun, 05 Feb 2017 22:54:08 -0800
parents 8ac2d6045d1d
children 72f17534d58e
comparison
equal deleted inserted replaced
837:ad8f48a31c62 838:89a44af17062