Merge

2013-07-13 11:44:25 +02:00 · 2013-07-13 11:44:25 +02:00 · 6c79247a4b
commit 6c79247a4b
parent 0d1ab71b05
29 changed files with 0 additions and 13 deletions
--- a/dev/initdata/generate-commande.php
+++ b/dev/initdata/generate-commande.php
--- a/dev/initdata/generate-facture.php
+++ b/dev/initdata/generate-facture.php
--- a/dev/initdata/generate-produit.php
+++ b/dev/initdata/generate-produit.php
--- a/dev/initdata/generate-propale.php
+++ b/dev/initdata/generate-propale.php
--- a/dev/initdata/generate-societe.php
+++ b/dev/initdata/generate-societe.php
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@ -433,18 +433,6 @@ if ($resql)
 }

 // Browser
-<<<<<<< HEAD
-print '<br>';
-print '<strong>'.$langs->trans("Browser").'</strong>: ';
-var_dump($conf->browser);
-print '<br>';
-
-// Database statistics update
-print '<br>';
-print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
-print '<br>';
-
-=======
 print '<br>';
 print '<strong>'.$langs->trans("Browser").'</strong>:<br>';
 if (! in_array($conf->browser->name, array('chrome','opera','safari','firefox')))
@ -463,7 +451,6 @@ print '<br>';
 print '<strong>'.$langs->trans("DatabaseStatistics").'</strong>: ';
 print '<br>';
 */
->>>>>>> 7485192cfbca23027d10cfdc41a33a14f332d23c


 llxFooter();
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
--- a/htdocs/core/class/genericobject.class.php
+++ b/htdocs/core/class/genericobject.class.php
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
--- a/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
+++ b/htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
--- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
+++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php