Update of /cvsroot/aimmath/AIM/WEB-INF/maple/aim
In directory sc8-pr-cvs1:/tmp/cvs-serv8766/WEB-INF/maple/aim
Modified Files:
Question.mpl
Log Message:
removed conflict markers
Index: Question.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/aim/Question.mpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Question.mpl 26 Aug 2003 18:38:49 -0000 1.4
--- Question.mpl 26 Aug 2003 21:39:39 -0000 1.5
***************
*** 2209,2213 ****
[["a",
"href" = sprintf("javascript:EditSource('%s');",
! this['SourceFile'])],
__("Edit source file")])]]);
--- 2209,2213 ----
[["a",
"href" = sprintf("javascript:EditSource('%s');",
! this['SourceFile'])],
__("Edit source file")])]]);
***************
*** 2247,2251 ****
[["a",
"href" = sprintf("javascript:EditSource('%s');",
! this['SourceFile'])],
__("Edit source file")])]]);
--- 2247,2251 ----
[["a",
"href" = sprintf("javascript:EditSource('%s');",
! this['SourceFile'])],
__("Edit source file")])]]);
***************
*** 2253,2257 ****
this['Description'] <> "" then
control['AddContents',
- <<<<<<< Question.mpl
["tr",
[["td", "align" = "left"],
--- 2253,2256 ----
***************
*** 2259,2275 ****
[["td", "align" = "left", "colspan" = "3"],
["latex", this['Description']]]]];
- =======
- # KM
- # DIST "tr",
- ["tr",
- # END KM
- [["td", "align" = "left"],
- ["b", __("Description"), ":"]],
- [["td", "align" = "left", "colspan" = "3"],
- # KM
- # DIST ["latex", this['Description']]]];
- ["latex", this['Description']]]]];
- # END KM
- >>>>>>> 1.2.2.2
fi;
--- 2258,2261 ----
***************
*** 2956,2960 ****
['Field','Contents'::{list(`aim/Question/Analysis/Entry`),
! list(`aim/Question/Analysis/Summary/Layer`)},
""
],
--- 2942,2946 ----
['Field','Contents'::{list(`aim/Question/Analysis/Entry`),
! list(`aim/Question/Analysis/Summary/Layer`)},
""
],
|
