[Pytest-commit] [pytest-dev/pytest] 51ebad: Fix merge instruction after a minor/major release

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
      https://github.com/pytest-dev/pytest/commit/51ebad76f2b996bf578b9bd89cf1c8eddaf98f42
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2017-08-01 (Tue, 01 Aug 2017)

  Changed paths:
    M HOWTORELEASE.rst

  Log Message:
  -----------
  Fix merge instruction after a minor/major release