X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Flibhtml-calendarmonth-perl.git;a=blobdiff_plain;f=lib%2FHTML%2FCalendarMonth%2FDateTool.pm;h=e69328dbea19d42c932c7b84e83e7b9028a283f8;hp=702a30fcd5c75947a451b5636816ad44dbb7e0a5;hb=eb13c41145995bc9fad3ac583bc8dd43d472f64b;hpb=ed44be48bb467d82127717d1ae2d11890aaf329b

diff --git a/lib/HTML/CalendarMonth/DateTool.pm b/lib/HTML/CalendarMonth/DateTool.pm
index 702a30f..e69328d 100644
--- a/lib/HTML/CalendarMonth/DateTool.pm
+++ b/lib/HTML/CalendarMonth/DateTool.pm
@@ -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])