From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 6 Apr 2011 05:57:53 +0000 (-0500)
Subject: changelog
X-Git-Tag: 0.29
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eb403ae2f0607404f5d016ca9a86a5ef4e2c5ebd;p=gitmo%2FPackage-Stash.git

changelog
---

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)