[parrot/parrot] aff726: Undeleted git-conflict marker caused Perl syntax e...

[noreply at github.com]

Branch: refs/heads/opsc_llvm
Home:   https://github.com/parrot/parrot

Commit: aff726f5045b227e2d15e5bdf16c13b5cac76aee
    https://github.com/parrot/parrot/commit/aff726f5045b227e2d15e5bdf16c13b5cac76aee
Author: jkeenan <jkeenan at cpan.org>
Date:   2011-03-30 (Wed, 30 Mar 2011)

Changed paths:
  M t/steps/auto/llvm-01.t

Log Message:
-----------
Undeleted git-conflict marker caused Perl syntax error; delete it.