From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 28 Mar 2011 01:01:27 +0000 (-0500)
Subject: changelog
X-Git-Tag: 0.27
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=be98e65cb23e5cea2a16e98913c09d2b105a0d32;p=gitmo%2FPackage-Stash.git

changelog
---

diff --git a/Changes b/Changes
index f876d1e..ffb7990 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - also skip the package-stash-conflicts script (Father Chrysostomos)
 
 0.26  2011-03-04
       - make the namespace cache lazy and weak, in case the stash is deleted