This project is archived and is in readonly mode.
Changeset [3a621e7be4d5f592e04e8ee03435936f9e5f1c36] by Xavier Noria
Revision 3a621e7be4d5f592e04e8ee03435936f9e5f1c36,
committed by Xavier Noria
· March 6th, 2011 @ 07:34 PM
removes merge conflicts
https://github.com/rails/rails/commit/3a621e7be4d5f592e04e8ee034359...
2 changed files
-
M
activesupport/lib/active_support/core_ext/hash/reverse_merge.rb -
M
activesupport/lib/active_support/core_ext/object/blank.rb