Index: openacs-4/packages/survey/www/process-response.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/survey/www/process-response.tcl	30 Dec 2002 01:45:51 -0000	1.8
+++ openacs-4/packages/survey/www/process-response.tcl	30 Dec 2002 02:11:08 -0000	1.9
@@ -195,18 +195,17 @@
 			db_dml survey_question_response_choice_insert "insert into survey_question_responses (response_id, question_id, choice_id)
  values (:response_id, :question_id, :response_value)"
 		    }
-<<<<<<< process-response.tcl
-<<<<<<< process-response.tcl
+
 		}  else {
 		    if { [empty_string_p $response_value] || [empty_string_p [lindex $response_value 0]] } {
-=======
+
 		}
 		"shorttext" {
 		    db_dml survey_question_choice_shorttext_insert "insert into survey_question_responses (response_id, question_id, varchar_answer)
  values (:response_id, :question_id, :response_value)"
 		}
 		"boolean" {
-=======
+
 		}
 		"shorttext" {
 		    db_dml survey_question_choice_shorttext_insert "insert into survey_question_responses (response_id, question_id, varchar_answer)