Fixed merge conflicts

2014-07-18 20:35:15 -06:00
parent 21ec7bb82a
commit 1efe20fe42
41 changed files with 1185 additions and 105 deletions
@@ -37,7 +37,7 @@ module I18n
 			when 't', 'title'
 				return (Forgery::LoremIpsum.sentences 1, options).capitalize
 			end
-			return nil
+			return method
 		end

 		def self.note(key, behavior = nil, behavior_size = nil)