2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e848452d9d..fcadde8b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,7 +60,6 @@ Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
 	  undocumented.
 
->>>>>>> 1.2673.2.1315
 Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/delegate.rb: document update from James Edward Gray II
diff --git a/version.h b/version.h
index 34a142abb7..333299b0c1 100644
--- a/version.h
+++ b/version.h
@@ -1,14 +1,14 @@
 #define RUBY_VERSION "1.8.3"
-#define RUBY_RELEASE_DATE "2005-10-07"
+#define RUBY_RELEASE_DATE "2005-10-08"
 #define RUBY_VERSION_CODE 183
-#define RUBY_RELEASE_CODE 20051007
+#define RUBY_RELEASE_CODE 20051008
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_YEAR 2005
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];