From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 2 Jan 2011 12:16:42 +0000 (-0600)
Subject: changelog
X-Git-Tag: 0.17
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=edb592e309203664a25783e47d2add46c5a2d083;p=gitmo%2FPackage-Stash.git

changelog
---

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