* version.h: fix conflict.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 12 deletions

diff --git a/version.h b/version.h
index 59d3edcda..a4d41b0f2 100644
--- a/version.h
+++ b/version.h
@@ -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[];