changelog

diff --git a/Changes b/Changes
index 28f4fe8..9f9d818 100644 (file)
--- 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)