Fixed conflict

chadadavis · Jan 29, 2012 · b803a0e · b803a0e
2 parents ede27bd + f10a31c
commit b803a0e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/perl/parallel.pl b/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 ".";