CVS: sml/src/smlnj-lib/PP/src pp-desc-fn.sml,1.4,1.5
John Reppy <[email protected]>
| Newsgroups | gmane.comp.lang.sml.smlnj.commits |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/smlnj/sml/src/smlnj-lib/PP/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14626/PP/src
Modified Files:
pp-desc-fn.sml
Log Message:
Resolve conflict.
Index: pp-desc-fn.sml
===================================================================
RCS file: /cvsroot/smlnj/sml/src/smlnj-lib/PP/src/pp-desc-fn.sml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pp-desc-fn.sml 24 Jul 2005 00:41:21 -0000 1.4
--- pp-desc-fn.sml 25 Oct 2005 15:34:13 -0000 1.5
***************
*** 8,13 ****
*)
! functor PPDescFn (PPS : PP_STREAM) : PP_DESC
! = struct
structure PPS = PPS
--- 8,13 ----
*)
! functor PPDescFn (S : PP_STREAM) : PP_DESC =
! struct
structure PPS = PPS
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information