diff options
-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[]; |