Thomas Reynolds ddc0712c1b Say :update, not :create on automatic conflict resolution		2012-06-19 19:40:57 -07:00
..
middleman-core	Say :update, not :create on automatic conflict resolution	2012-06-19 19:40:57 -07:00
middleman-core.rb	Remove usage of autoload statement in favor of require	2012-05-07 14:41:39 -07:00