Commit d32a97f9c22997b425c6429ee4693c8ad1d7bb0e
1 parent
bb107427
Exists in
master
and in
7 other branches
--no commit message
Showing
1 changed file
with
0 additions
and
4 deletions
Show diff stats
ms_criamapa.php
| @@ -310,11 +310,7 @@ if(!isset($base) || $base == "") | @@ -310,11 +310,7 @@ if(!isset($base) || $base == "") | ||
| 310 | } | 310 | } |
| 311 | else | 311 | else |
| 312 | { | 312 | { |
| 313 | -<<<<<<< .mine | ||
| 314 | - $base = "geral1v".versao; | ||
| 315 | -======= | ||
| 316 | $base = "geral1v".$versao; | 313 | $base = "geral1v".$versao; |
| 317 | ->>>>>>> .r2359 | ||
| 318 | $estadosl = "estadosl"; | 314 | $estadosl = "estadosl"; |
| 319 | } | 315 | } |
| 320 | } | 316 | } |