merge conflic

This commit is contained in:
jpb 2021-04-29 17:34:56 +02:00
commit 6aa9c35f0f

View File

@ -550,10 +550,10 @@ if ($resql) {
print "</div>"; print "</div>";
print '</form>'; print '</form>';
} else { } else {
dol_print_error($db); dol_print_error($db);
} }
llxFooter(); llxFooter();
$db->close(); $db->close();