Permalink
Browse files

Merge remote-tracking branch 'upstream/rails3' into rails3

  • Loading branch information...
ZenCocoon committed Apr 3, 2011
2 parents 70bef13 + 088938e commit 5506037287dfd382a985ef87abf29dee06b87e1d
Showing with 0 additions and 2 deletions.
  1. +0 −2 init.rb
View
@@ -1,5 +1,3 @@
-Mime::Type.register_alias "text/yaml", :yml
-
$KCODE = 'UTF8'
begin
require 'ya2yaml'

0 comments on commit 5506037

Please sign in to comment.