1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* version.h: fix conflict.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2006-03-27 14:03:44 +00:00
parent 588a533286
commit f1ad743015
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
version.h
View File

@ -1,26 +1,14 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
<<<<<<< version.h
#define RUBY_RELEASE_DATE "2006-03-27" #define RUBY_RELEASE_DATE "2006-03-27"
=======
#define RUBY_RELEASE_DATE "2006-03-27"
>>>>>>> 1.1410
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
<<<<<<< version.h
#define RUBY_RELEASE_CODE 20060327 #define RUBY_RELEASE_CODE 20060327
=======
#define RUBY_RELEASE_CODE 20060327
>>>>>>> 1.1410
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2006 #define RUBY_RELEASE_YEAR 2006
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3
<<<<<<< version.h
#define RUBY_RELEASE_DAY 27 #define RUBY_RELEASE_DAY 27
=======
#define RUBY_RELEASE_DAY 27
>>>>>>> 1.1410
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];