--no commit message

Edmar Moretti
1 parent bb107427
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
ms_criamapa.php
@@ -310,11 +310,7 @@ if(!isset($base) || $base == &quot;&quot;)
 	}
 	else
 	{
-<<<<<<< .mine
-		$base = "geral1v".versao;
-=======
 		$base = "geral1v".$versao;
->>>>>>> .r2359
 		$estadosl = "estadosl";
 	}
 }