From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 21 Jun 2016 03:31:42 +0000 (-0700)
Subject: Merge tag 'upstream/2.04'
X-Git-Tag: debian/2.04-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eb13c41145995bc9fad3ac583bc8dd43d472f64b;p=deb_pkgs%2Flibhtml-calendarmonth-perl.git

Merge tag 'upstream/2.04'

Upstream version 2.04
---

eb13c41145995bc9fad3ac583bc8dd43d472f64b
diff --cc lib/HTML/CalendarMonth/DateTool.pm
index 0e752a3,702a30f..e69328d
--- a/lib/HTML/CalendarMonth/DateTool.pm
+++ b/lib/HTML/CalendarMonth/DateTool.pm
@@@ -450,7 -450,7 +450,11 @@@ methods are necessary
  
  For a given day, and optionally C<month> and C<year> if they are
  different from those specified in C<new()>, provide the day of week
++<<<<<<< HEAD
 +number. (1=Sunday, 7=Saturday).
++=======
+ number. (0=Sunday, 6=Saturday).
++>>>>>>> upstream/2.04
  
  =item add_days($days, $delta, $day, [$month], [$year])