--- loncom/TODO	2001/08/03 16:48:26	1.103
+++ loncom/TODO	2001/08/03 17:11:24	1.104
@@ -55,17 +55,13 @@ HOMEWORK
     * if there are <*response> in a <problem> and there are also 
 	<part>s defined the handling of the <*response> outside of the 
 	<part> will be done poorly.
-<<<<<<< TODO
     * sigfigs are poorly supported (metadata needs to be better)
     * multiple response in a multipart question are screwing up
     * input areas need to hide after correct
     * <randomlist> needs to be stable
     * previous answers need to be ignored
-
-=======
     * id in parameter_... (see tol on mmp resources, s10)
- 
->>>>>>> 1.102
+
 /ADM/GRADES
     * show list of multiple students if multiple match (Y)
     + handle ambiguous case (Y)