removed <<<HEAD code

2013-08-15 13:33:54 -07:00 · 2013-08-15 13:33:54 -07:00 · 91c64d7b3d
parent 2c5a77348d
commit 91c64d7b3d
1 changed files with 1 additions and 4 deletions
--- a/lib/DDG/Goodie/Week.pm
+++ b/lib/DDG/Goodie/Week.pm
@ -66,11 +66,7 @@ handle remainder => sub {
 		
 	}

-<<<<<<< HEAD
 	elsif ($input =~ /(\d{1,2})(?:rd|nd|st|th)$var_st(\d{1,4})/) {
-=======
-	elsif ($input =~ /^(\d{1,2})\s+(\d{1-4})$/) {
->>>>>>> b132dc1c2bc1fc4afba72bc00cb0a926a1ff3973

 		my $week_num = $1;
 		my $year = $2;
@ -81,6 +77,7 @@ handle remainder => sub {

 		return "The " . ordinate($week_num) . " week of $year began on " .
 		  $months{$month} . " " . ordinate($day);
+		
 	}

 	else {