kou	2012-11-04 21:37:11 +0900 (Sun, 04 Nov 2012)

  New Revision: 37467

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37467

  Log:
    * ChangeLog: Remove garbages.

  Modified files:
    trunk/ChangeLog

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37466)
+++ ChangeLog	(revision 37467)
@@ -1,12 +1,9 @@
-<<<<<<< HEAD
-=======
 Sun Nov  4 20:29:46 2012  Takeyuki FUJIOKA  <xibbar@r...>
 
 	* lib/cgi.rb, lib/cgi/*/rb: rename CGI#header to CGI#http_header,
 	  add  and update HTML5 tag generater.  [Bug #7110]
 	  Patch provided by Marcus Stollsteimer, thank you !
 
->>>>>>> * lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]
 Sun Nov  4 11:47:39 2012  Masaki Matsushita  <glass.saga@g...>
 
 	* lib/fileutils.rb (module FileUtils): repatch [ruby-core:39622]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/