diff --git a/version.h b/version.h index 87f0f038e9..92026852f3 100644 --- a/version.h +++ b/version.h @@ -1,26 +1,14 @@ #define RUBY_VERSION "1.9.0" -<<<<<<< version.h #define RUBY_RELEASE_DATE "2005-05-24" -======= -#define RUBY_RELEASE_DATE "2005-05-24" ->>>>>>> 1.1159 #define RUBY_VERSION_CODE 190 -<<<<<<< version.h #define RUBY_RELEASE_CODE 20050524 -======= -#define RUBY_RELEASE_CODE 20050524 ->>>>>>> 1.1159 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2005 #define RUBY_RELEASE_MONTH 5 -<<<<<<< version.h #define RUBY_RELEASE_DAY 24 -======= -#define RUBY_RELEASE_DAY 24 ->>>>>>> 1.1159 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[];