Skip to content
Commit ecae4d73 authored by Javier Jardón's avatar Javier Jardón
Browse files

Merge branch 'chandan/fix-pytest-get-marker' into 'master' 

conftest.py: Don't use deprecated get_marker() function

See merge request !1073
parents 80fe0d9a c91784ab
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment