From be98e65cb23e5cea2a16e98913c09d2b105a0d32 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 27 Mar 2011 20:01:27 -0500
Subject: changelog

---
 Changes | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Changes')

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
-- 
cgit v1.2.3-54-g00ecf