kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the merge conflict from 6b8897db5f

This commit is contained in:
Eric Davis 2011-05-30 14:05:40 -07:00
parent 6b8897db5f
commit 790bb362c5
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/redmine/version.rb
View File

@ -20,6 +20,21 @@ module Redmine
PATCH = 0 PATCH = 0
TINY = PATCH # Redmine compat TINY = PATCH # Redmine compat
# Used by semver to define the special version (if any).
# A special version "satify but have a lower precedence than the associated
# normal version". So 2.0.0RC1 would be part of the 2.0.0 series but
# be considered to be an older version.
#
# 1.4.0 < 2.0.0RC1 < 2.0.0RC2 < 2.0.0 < 2.1.0
#
# This method may be overridden by third party code to provide vendor or
# distribution specific versions. They may or may not follow semver.org:
#
# 2.0.0debian-2
def self.special
'RC1'
end
def self.revision def self.revision
revision = nil revision = nil
entries_path = "#{RAILS_ROOT}/.svn/entries" entries_path = "#{RAILS_ROOT}/.svn/entries"