annotate lib/redmine/core_ext/date.rb @ 1485:c8d3ad483bea redmine-2.4-integration

Fix stray merge markers
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 15 Jan 2014 13:34:12 +0000
parents 433d4f72a19b
children
rev   line source
Chris@1115 1 require File.dirname(__FILE__) + '/date/calculations'
Chris@1115 2
Chris@1115 3 class Date #:nodoc:
Chris@1115 4 include Redmine::CoreExtensions::Date::Calculations
Chris@1115 5 end