diff options
| author | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2016-06-22 14:39:33 +0200 |
|---|---|---|
| committer | Ronny Pfannschmidt <ronny.pfannschmidt@redhat.com> | 2016-06-22 14:39:33 +0200 |
| commit | 083f64100d2b4a7074bb46b0e5c2443c5323114e (patch) | |
| tree | 325c009862c93d565a6da4c74657b35243d30adc /_pytest/__init__.py | |
| parent | 4350f499b2bdf0bcc24e55787436928b021489e3 (diff) | |
| parent | 24179dc99fd8d7c5196f583aedd9121441abac8e (diff) | |
| download | pytest-083f64100d2b4a7074bb46b0e5c2443c5323114e.tar.gz | |
merge master into features
Diffstat (limited to '_pytest/__init__.py')
| -rw-r--r-- | _pytest/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/_pytest/__init__.py b/_pytest/__init__.py index fcbd2cde7..79942e374 100644 --- a/_pytest/__init__.py +++ b/_pytest/__init__.py @@ -1,3 +1,2 @@ # - __version__ = '2.10.0.dev1' |