Cleanup Changelog merge lines

Author: dbussink

ChangeLog

@@ -130,7 +130,6 @@ Mon Feb 24 14:56:41 2014  WATANABE Hirofumi  <eban@ruby-lang.org>
 Mon Feb 24 14:56:41 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* tool/make-snapshot: support new version scheme.
->>>>>>> v2_1_2
 
 Mon Feb 24 13:05:48 2014  Aaron Patterson <aaron@tenderlovemaking.com>
 
@@ -711,7 +710,6 @@ Thu Jan  9 08:21:00 2014  Aman Gupta <ruby@tmm1.net>
 	* test/net/imap/Makefile: add `make regen_certs` to automate this
 	  process.
 
->>>>>>> v2_1_1
 Thu Dec 26 03:28:11 2013  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_insnhelper.c (argument_error): insert dummy frame to make