From: Hans Dieter Pearcey <hdp@weftsoar.net>
Date: Fri, 22 Jan 2010 15:14:45 +0000 (-0500)
Subject: remove conflict marker
X-Git-Tag: 0.95~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=82e1e62974aea294d62248e17c3f479c9f72630a;p=gitmo%2FMoose.git

remove conflict marker
---

diff --git a/lib/Moose/Manual/Delta.pod b/lib/Moose/Manual/Delta.pod
index 3ed438a..6b64457 100644
--- a/lib/Moose/Manual/Delta.pod
+++ b/lib/Moose/Manual/Delta.pod
@@ -35,7 +35,6 @@ removed.
 The attributes returned by L<Moose::Meta::Role> are now instances of the
 L<Moose::Meta::Role::Attribute> class, instead of bare hash references.
 
-<<<<<<< HEAD:lib/Moose/Manual/Delta.pod
 =item "no Moose" now removes C<blessed> and C<confess>
 
 Moose is now smart enough to know exactly what it exported, even when it