From edb592e309203664a25783e47d2add46c5a2d083 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 2 Jan 2011 06:16:42 -0600
Subject: changelog

---
 Changes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changes b/Changes
index 5036f25..4b6ff71 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - use Dist::Zilla::Plugin::Conflicts rather than doing it by hand
+      - silence deprecation warnings for the method renaming for now
 
 0.16  2010-12-31
       - use Dist::CheckConflicts
-- 
cgit v1.2.3-54-g00ecf