1 files changed, 15 insertions, 3 deletions
diff --git a/version.h b/version.h
index 849dddbaf8..59d3edcdad 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,26 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2006-03-26"
+<<<<<<< version.h
+#define RUBY_RELEASE_DATE "2006-03-27"
+=======
+#define RUBY_RELEASE_DATE "2006-03-27"
+>>>>>>> 1.1410
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20060326
+<<<<<<< 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
-#define RUBY_RELEASE_DAY 26
+<<<<<<< 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[];