[Pytest-commit] [pytest-dev/pytest] 21f1c2: Update fixtures.py

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 21f1c2b03f21db8aa54dea61d7f96d1c0573af79
      https://github.com/pytest-dev/pytest/commit/21f1c2b03f21db8aa54dea61d7f96d1c0573af79
  Author: Ben Lloyd <shobute at users.noreply.github.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Update fixtures.py

Corrected "or or" typo in docstring (and made indentation consistent).


  Commit: 47a2a77cb494a8cac3bfd9f5d6af13d6d551abcb
      https://github.com/pytest-dev/pytest/commit/47a2a77cb494a8cac3bfd9f5d6af13d6d551abcb
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M _pytest/fixtures.py

  Log Message:
  -----------
  Merge pull request #2354 from shobute/patch-1

Corrected documentation typo in fixtures.py


Compare: https://github.com/pytest-dev/pytest/compare/8c69d5c9398c...47a2a77cb494