1 files changed, 15 insertions, 3 deletions
diff --git a/version.h b/version.h
index 3abde94cb..87f0f038e 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,26 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2005-05-23"
+<<<<<<< version.h
+#define RUBY_RELEASE_DATE "2005-05-24"
+=======
+#define RUBY_RELEASE_DATE "2005-05-24"
+>>>>>>> 1.1159
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20050523
+<<<<<<< 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
-#define RUBY_RELEASE_DAY 23
+<<<<<<< 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[];