whoops, the conflicts plugin takes care of this too

[gitmo/Package-Stash.git] / Changes

diff --git a/Changes b/Changes
index e8f9c99..8c8e18a 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,18 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - stop manually inserting conflict checking into Makefile.PL since we're
+        using the dzil Conflicts plugin now
+
+0.18  2011-01-03
+      - non-trial release
+
+0.17-TRIAL  2011-01-03
+      - use Dist::Zilla::Plugin::Conflicts rather than doing it by hand
+      - silence deprecation warnings for the method renaming for now
+
+0.16-TRIAL  2010-12-31
+      - use Dist::CheckConflicts
 
 0.15-TRIAL  2010-11-16
       - split the XS conversion out to its own dist (Package-Stash-XS), and