remove conflict marker
authorHans Dieter Pearcey <hdp@weftsoar.net>
Fri, 22 Jan 2010 15:14:45 +0000 (10:14 -0500)
committerHans Dieter Pearcey <hdp@weftsoar.net>
Fri, 22 Jan 2010 15:14:45 +0000 (10:14 -0500)
commit82e1e62974aea294d62248e17c3f479c9f72630a
tree07e1703b691db2ed771be63267408f7ba30a1cd8
parentc310bfa05ac3defa413ad464e0c0350cab908995
remove conflict marker
lib/Moose/Manual/Delta.pod