Fix bad merge of upstream commit

Author: vbwagner

src/tools/msvc/Mkvcbuild.pm

@@ -765,23 +765,6 @@ sub mkvcbuild
 				die 'Failed to create plperl_opmask.h' . "\n";
 			}
 		}
-<<<<<<< HEAD
-		$plperl->AddReference($postgres);
-		my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*.*';
-		my @perl_libs =
-		  grep { /perl\d+.(lib|a)$/ }
-		  glob($perl_path);
-		if (@perl_libs == 1)
-		{
-			$plperl->AddLibrary($perl_libs[0]);
-		}
-		else
-		{
-			die
-"could not identify perl library version matching pattern $perl_path\n";
-		}
-=======
->>>>>>> 9b5c99790e... MSVC: Test whether 32-bit Perl needs -D_USE_32BIT_TIME_T.
 
 		# Add transform module dependent on plperl
 		my $hstore_plperl = AddTransformModule(