diff options
author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-03-27 14:03:44 +0000 |
---|---|---|
committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-03-27 14:03:44 +0000 |
commit | f1ad74301564bf1fb03802a83a1d58511c575999 (patch) | |
tree | 5940ea791d49a366526930d8fd991efe1484173b | |
parent | 588a5332861d770f38e06ba51b47d075a54710f8 (diff) | |
download | ruby-f1ad74301564bf1fb03802a83a1d58511c575999.tar.gz |
* version.h: fix conflict.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | version.h | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -1,26 +1,14 @@ #define RUBY_VERSION "1.9.0" -<<<<<<< version.h #define RUBY_RELEASE_DATE "2006-03-27" -======= -#define RUBY_RELEASE_DATE "2006-03-27" ->>>>>>> 1.1410 #define RUBY_VERSION_CODE 190 -<<<<<<< version.h -#define RUBY_RELEASE_CODE 20060327 -======= #define RUBY_RELEASE_CODE 20060327 ->>>>>>> 1.1410 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2006 #define RUBY_RELEASE_MONTH 3 -<<<<<<< version.h -#define RUBY_RELEASE_DAY 27 -======= #define RUBY_RELEASE_DAY 27 ->>>>>>> 1.1410 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |