From 7adbc6a9c28c25c638a86df745d80af8d11b0a3e Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Sep 2014 17:13:46 +0000
Subject: [PATCH] * ChangeLog: fix a typo for r47533.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ce8903a4a7..4b58a4ef34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,7 @@ Thu Sep 11 19:32:30 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (rb_gc_mark_values): added.
 	  This function is similar to rb_gc_mark_locations(), but not
-	  conservertive.
+	  conservative.
 
 	* internal.h: ditto.