From a7c9c6cfc12748fe1544b453b3e616130e69e55e Mon Sep 17 00:00:00 2001
From: strcmp <28xdb6+fvutuvy4f@grr.la>
Date: Fri, 11 Dec 2015 06:11:58 +0000
Subject: [PATCH] update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a823662d..12f1d17c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ### HEAD
+* Remove Slop as a runtime dependency by vendoring v3.4 as Pry::Slop.
+  People can depend on Slop v4 and Pry at the same time without running into version conflicts. ([#1497](https://github.com/pry/pry/issues/1497))
 * Fix auto-indentation of code that uses a single-line rescue ([#1450](https://github.com/pry/pry/issues/1450))
 * Remove "Pry::Config#refresh", please use "Pry::Config#clear" instead.
 * Defining a method called "ls" no longer breaks the "ls" command ([#1407](https://github.com/pry/pry/issues/1407))