Merge pull request #1241 from ggoebel/js

fix merge conflict
rakudo · Nov 8, 2017 · e34f66e · e34f66e
2 parents 95991af + a628e1c
commit e34f66e
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/t/harness5 b/t/harness5
@@ -40,14 +40,8 @@ GetOptions(
 my @pass_through_options = grep m/^--?[^-]/, @ARGV;
 my @files = grep m/^[^-]/, @ARGV;
 
-<<<<<<< HEAD
-
 $ENV{'HARNESS_PERL'} = ".${slash}perl6-" . ($js ? "js" : $moar ? "m" : $jvm ? "j" : "m");
 $ENV{'PERL6LIB'} = "lib"; 
-=======
-$ENV{'HARNESS_PERL'} = ".${slash}perl6-" . ($moar ? "m" : $jvm ? "j" : "m");
-$ENV{'PERL6LIB'} = "lib";
->>>>>>> origin/nom
 
 my @slow;
 if ($list_file) {