From c737502d35d3b1f9c5009287b6933983045fcb7f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 3 Feb 2006 17:39:36 +0000 Subject: [PATCH] Fix: conflit cvs --- htdocs/html.form.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 658b44cdc8e..36d96f077de 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -590,7 +590,7 @@ class Form while ($i < $num) { $objp = $this->db->fetch_object($result); - $opt = '