Permalink
Browse files

Fixed conflict

  • Loading branch information...
2 parents ede27bd + f10a31c commit b803a0e07506b42c9eee58bfe2d8d1d5b0ea7f28 Chad A Davis committed Jan 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 perl/parallel.pl
View
2 perl/parallel.pl
@@ -9,7 +9,7 @@
my $a = [0..19];
sub doit {
- # Another incompatible change
+ # One incompatible change
my ($x) = @_;
for (my $i = 0; $i < 10000000; $i++) { }
print ".";

0 comments on commit b803a0e

Please sign in to comment.