From eb403ae2f0607404f5d016ca9a86a5ef4e2c5ebd Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Wed, 6 Apr 2011 00:57:53 -0500
Subject: changelog

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

(limited to 'Changes')

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