remove conflict marker

[gitmo/Moose.git] / lib / Moose / Manual / Delta.pod

diff --git a/lib/Moose/Manual/Delta.pod b/lib/Moose/Manual/Delta.pod
index 3ed438a..6b64457 100644 (file)
--- 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