fix conflicts

[kmrcl.git] / datetime.lisp

diff --git a/datetime.lisp b/datetime.lisp
index dd813c46f75cb7fc0bef7166d0fcc51ba5a1e6bb..30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d 100644 (file)
--- a/datetime.lisp
+++ b/datetime.lisp
@@ -40,7 +40,7 @@
   (multiple-value-bind (sec min hr dy mn yr) (decode-universal-time tm)
     (pretty-date yr mn dy hr min sec)))
 
-(defun date-string (ut)
+(defun date-string (&optional (ut (get-universal-time)))
   (if (typep ut 'integer)
       (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
           (decode-universal-time ut)