Basic conflict message
authorShawn M Moore <sartak@gmail.com>
Sun, 31 May 2009 01:59:02 +0000 (21:59 -0400)
committerShawn M Moore <sartak@gmail.com>
Sun, 31 May 2009 01:59:02 +0000 (21:59 -0400)
commit884837f36d1800729e8a114fea5fb1f711e6c379
tree2f086608948f650dbc71600b15236e6ce200e3ec
parent2ee514b1f22357435ed4271f8a9f9d1dd175e508
Basic conflict message
lib/Moose/Meta/Role/Application/ToClass.pm