Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1:/tmp/cvs-serv21652/WEB-INF/maple
Modified Files:
Tag: develop_2_1
Make.mpl
Log Message:
Fixed stray diff markup
Index: Make.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Make.mpl,v
retrieving revision 1.1.1.1.2.3
retrieving revision 1.1.1.1.2.4
diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4
*** Make.mpl 10 Jul 2003 20:10:03 -0000 1.1.1.1.2.3
--- Make.mpl 10 Jul 2003 21:32:09 -0000 1.1.1.1.2.4
***************
*** 102,113 ****
Make_ok := true:
while (line <> 0) do
- <<<<<<< Make.mpl
- line := util_unixify(line):
- =======
# remove comment (possibly preceded by whitespace) or
# whitespace at end of line from line
line := StringTools:-RegSub("^([^ \t#]*)([ \t]*#.*|[ \t]*.*$)?", line, "\\1");
line := util_unixify(line);
- >>>>>>> 1.1.1.1.2.2
if line <> "" then
Make_ok := evalb(package_read(cat(line,".mpl")) and Make_ok):
--- 102,109 ----
|
