summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>2001-02-10 19:42:38 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>2001-02-10 19:42:38 +0000
commit5a0d3b0d1f3cd8cbd1be61d0b9c4aded53a18c55 (patch)
treeff8af1f9429138dd142097ef502fae31f30c758e
parent6dfdbf4e5f4f02783bc3d43bcc87b2827fbf44bd (diff)
Fix merge problem
-rw-r--r--gnu/usr.bin/cvs/lib/getdate.y2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/cvs/lib/getdate.y b/gnu/usr.bin/cvs/lib/getdate.y
index 776323cf4de..9caaa367881 100644
--- a/gnu/usr.bin/cvs/lib/getdate.y
+++ b/gnu/usr.bin/cvs/lib/getdate.y
@@ -651,7 +651,7 @@ Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode)
Year = -Year;
if (Year < 69)
Year += 2000;
- else if (Year < 100)
+ else if (Year < 100) {
Year += 1900;
if (Year < EPOCH)
Year += 100;