fix conflicts

[kmrcl.git] / datetime.lisp

diff --git a/datetime.lisp b/datetime.lisp
index 348cf58c60a0f8453cdbc0b672d2fafe8758b297..30c815c9d01d5bf482e084c5c6ee6ed8b9c0dd7d 100644 (file)
--- a/datetime.lisp
+++ b/datetime.lisp
@@ -45,7 +45,7 @@
       (multiple-value-bind (sec min hr day mon year dow daylight-p zone)
           (decode-universal-time ut)
         (declare (ignore daylight-p zone))
-        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~], ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
+        (format nil "~[Mon~;Tue~;Wed~;Thu~;Fri~;Sat~;Sun~] ~d ~[Jan~;Feb~;Mar~;Apr~;May~;Jun~;Jul~;Aug~;Sep~;Oct~;Nov~;Dec~] ~d ~2,'0d:~2,'0d:~2,'0d"
                 dow
                 day
                 (1- mon)