summaryrefslogtreecommitdiffstats
path: root/share/zoneinfo/southamerica
diff options
context:
space:
mode:
authorwollman <wollman@FreeBSD.org>2004-12-02 23:01:25 +0000
committerwollman <wollman@FreeBSD.org>2004-12-02 23:01:25 +0000
commit9fee976b4f91c9158ce17002d1ec3ba8c08999ba (patch)
tree6573610dbe2635e968b8653874a3a22b921938ed /share/zoneinfo/southamerica
parentb9b9fdbd3f6765fad8f3669da3ea91afe9952b52 (diff)
downloadFreeBSD-src-9fee976b4f91c9158ce17002d1ec3ba8c08999ba.zip
FreeBSD-src-9fee976b4f91c9158ce17002d1ec3ba8c08999ba.tar.gz
Fix import conflicts from tzdata2004g.
Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata2004g.tar.gz
Diffstat (limited to 'share/zoneinfo/southamerica')
-rw-r--r--share/zoneinfo/southamerica4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/zoneinfo/southamerica b/share/zoneinfo/southamerica
index 9124910..eacd182 100644
--- a/share/zoneinfo/southamerica
+++ b/share/zoneinfo/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica 7.54
+# @(#)southamerica 7.55
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@@ -671,7 +671,7 @@ Zone America/Campo_Grande -3:38:28 - LMT 1914
# Mato Grosso (MT)
Zone America/Cuiaba -3:44:20 - LMT 1914
-4:00 Brazil AM%sT 2003 Sep 24
- -4:00 - AMT 2004 Oct 4
+ -4:00 - AMT 2004 Oct 1
-4:00 Brazil AM%sT
#
# west Para (PA), Rondonia (RO)
OpenPOWER on IntegriCloud