From: Dave Rolsky <autarch@urth.org>
Date: Sat, 13 Sep 2008 02:40:48 +0000 (+0000)
Subject: Oops, left in a conflict marker
X-Git-Tag: 0.58~34^2~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4d37bf21175a3667effbb2fb4a97cb415c840356;p=gitmo%2FMoose.git

Oops, left in a conflict marker
---

diff --git a/Changes b/Changes
index 1685b22..ff21d51 100644
--- a/Changes
+++ b/Changes
@@ -29,7 +29,6 @@ Revision history for Perl extension Moose
         always keep them. (Dave Rolsky)
         - added tests for this (rafl)
 
-<<<< 122127346164625
 0.57 Wed September 3, 2008
     * Moose::Intro
       - A new bit of doc intended to introduce folks familiar with