Permalink
Browse files

merge retidied

  • Loading branch information...
1 parent 5e5c49d commit 2da37b8bb6f8b6686b65723a6781f431f4fa3f16 @jonswar committed Jul 12, 2012
Showing with 0 additions and 5 deletions.
  1. +0 −5 t/mason-app.t
View
@@ -9,12 +9,7 @@ my $tempdir = tempdir( 'mason-app-XXXX', TMPDIR => 1, CLEANUP => 1 );
my $comp_file = "$tempdir/hello.mc";
write_file( $comp_file, "%% has 'd';\nd * 2 = <% \$.d * 2 %>" );
-<<<<<<< HEAD
# Ugly string escaping for Windows
-=======
-# This string escaping may look ugly, but it is only way to make it work under
-# Windows
->>>>>>> 31ad27340fa96c27b0ec358f31990791dd599b0c
my $output = `$^X bin/mason.pl $comp_file --data-dir $tempdir/data --args "{\\"d\\":\\"4\\"}"`;
is( $output, "d * 2 = 8\n", 'correct output' );
ok( -f "$tempdir/data/obj/hello.mc.mobj", "object file exists" );

0 comments on commit 2da37b8

Please sign in to comment.