Really fix ocnflicts
authorDave Rolsky <autarch@urth.org>
Wed, 24 Nov 2010 21:21:35 +0000 (15:21 -0600)
committerDave Rolsky <autarch@urth.org>
Wed, 24 Nov 2010 21:21:35 +0000 (15:21 -0600)
commit71dd0faa9e8e64146ca7f0167667db3191a1bf3a
tree5ec2ef88e37f84eceb20d5e0bb37eacb494a2a22
parenta46391f601afb05431392ceefae050b87eab23bb
Really fix ocnflicts
lib/Moose/Manual/Contributing.pod