X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Changes;h=9f9d81817b6bf9b7d5469c224fec6ca0d1aa66ce;hb=eb403ae2f0607404f5d016ca9a86a5ef4e2c5ebd;hp=28f4fe8afe6354f82e248fb6a19f16273e1a6048;hpb=a01e721b4682a921f52949a5436a9286c785335e;p=gitmo%2FPackage-Stash.git

diff --git a/Changes b/Changes
index 28f4fe8..9f9d818 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - no, *really* skip the package-stash-conflict script
 
 0.28  2011-03-29
       - META.json fixes (mst)