bad merge

2014-09-16 21:19:07 +02:00 · 2014-09-16 21:19:07 +02:00 · fc65421b2e
commit fc65421b2e
parent 32c777a78b
1 changed files with 5 additions and 4 deletions
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@ -542,6 +542,7 @@ if ($mysoc->tva_assuj == 'franchise')	// Non assujeti
    print '</tr>';
 }

+
 /*
 * Salaries
 */