From 5d0dbcfdce7d46c4a50f86782b831c361de72583 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Fri, 21 Apr 2017 21:55:18 -0300 Subject: [PATCH] Corrigido problema ao selecionar curso no cadastro de escola; portabilis/ieducar#167 --- ieducar/intranet/educar_curso_xml2.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ieducar/intranet/educar_curso_xml2.php b/ieducar/intranet/educar_curso_xml2.php index a46309e..ebb263a 100644 --- a/ieducar/intranet/educar_curso_xml2.php +++ b/ieducar/intranet/educar_curso_xml2.php @@ -32,7 +32,11 @@ require_once 'Portabilis/Utils/DeprecatedXmlApi.php'; Portabilis_Utils_DeprecatedXmlApi::returnEmptyQueryUnlessUserIsLoggedIn(); +<<<<<<< HEAD echo "\n\n"; +======= + echo "\n\n"; +>>>>>>> 89ed328... Corrigido problema ao selecionar curso no cadastro de escola; if( is_numeric( $_GET["ins"] ) ) { @@ -82,4 +86,4 @@ } } echo ""; -?> \ No newline at end of file +?> -- libgit2 0.21.2