|
|
|
@ -1,21 +1,9 @@
|
|
|
|
|
<?php |
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
$desabilitaLayout = 1; |
|
|
|
|
$smarty->assign("desabilitaLayout", $desabilitaLayout); |
|
|
|
|
$renderizarPagina = true; |
|
|
|
|
include "login/api_banner.php"; |
|
|
|
|
include "util/funcoesLicenca.php"; |
|
|
|
|
======= |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* Conexao com banco de dados |
|
|
|
|
*/ |
|
|
|
|
//coloca o focus no campo login |
|
|
|
|
$setFocus = "document.getElementById('loginUser').focus();"; |
|
|
|
|
//define alinhamento no conteudo do master.tpl |
|
|
|
|
$vAlineMaster = "middle"; |
|
|
|
|
>>>>>>> 90aaaf3 (mudar a inclusão do arquivo /include/util/funcoesLicenca.php) |
|
|
|
|
|
|
|
|
|
$tentativaErro = 5; |
|
|
|
|
|
|
|
|
|