summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr-obert <r@newton.osaka>2017-11-24 02:19:02 +0100
committerr-obert <r@newton.osaka>2017-11-24 02:19:02 +0100
commite930f26fa23e46c061a245c1715fdb24d8fbc653 (patch)
tree838af798dc23d24f1c46f09ecc42d8e4e82ba2f0
parentbaa34b49bcf3bf7b7c506c91be4b483321ca7a5d (diff)
downloadpry-require_relative.tar.gz
update CHANGELOG.md [ci skip]require_relative
-rw-r--r--CHANGELOG.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cec9c50..7468384a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,6 @@ See pull request [#1701](https://github.com/pry/pry/pull/1701).
See pull request [#1704](https://github.com/pry/pry/pull/1704).
-
#### Pry developers
* Optionally skip a spec on specific Ruby engine(s) by providing `expect_failure: [:mri, :jruby]`
@@ -33,7 +32,6 @@ See pull request [#1704](https://github.com/pry/pry/pull/1704).
See pull request [#1694](https://github.com/pry/pry/pull/1694).
->>>>>>> github/pry/master
### 0.11.3