From 70d7962e28eed7d00bd07c493f8dd5c01a8e3711 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 3 Jan 2011 10:31:08 -0600
Subject: whoops, the conflicts plugin takes care of this too

---
 Changes | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Changes')

diff --git a/Changes b/Changes
index 4434b3b..8c8e18a 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Revision history for Package-Stash
 
 {{$NEXT}}
+      - stop manually inserting conflict checking into Makefile.PL since we're
+        using the dzil Conflicts plugin now
 
 0.18  2011-01-03
       - non-trial release
-- 
cgit v1.2.3-54-g00ecf