From 8743d581778ba8e63bd6875aba2d37ca988ca22a Mon Sep 17 00:00:00 2001
From: Raymond Toy <toy.raymond@gmail.com>
Date: Wed, 30 Nov 2016 19:53:57 -0800
Subject: [PATCH] Fix merge conflicts

---
 src/code/time.lisp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/code/time.lisp b/src/code/time.lisp
index 51457f517..bf853a2b6 100644
--- a/src/code/time.lisp
+++ b/src/code/time.lisp
@@ -223,8 +223,11 @@
 	   (type (mod 24) hour)
 	   (type (integer 1 31) date)
 	   (type (integer 1 12) month)
-	   (type (or (integer 0 99) (integer 1900)) year)
-	   (type (or null rational) time-zone))
+	   ;; 1899 to account for time zones that are equivalent to 1900.
+	   (type (or (integer 0 99) (integer 1899)) year)
+	   (type (or null rational) time-zone)
+	   ;; Result must be non-negative integer!
+	   (values (integer 0)))
   (let* ((year (if (< year 100)
 		   (pick-obvious-year year)
 		   year))
-- 
GitLab