Fixed merge conflicts

2014-07-18 20:35:15 -06:00
parent 21ec7bb82a
commit 1efe20fe42
41 changed files with 1185 additions and 105 deletions
@@ -70,6 +70,6 @@ platforms 'mswin', 'mingw' do
 	end

 	group :staging, :production do
-		gem 'unicorn'
+		gem 'unicorn' if !(RbConfig::CONFIG['target_os'] =~ /mswin|mingw|cygwin/i)
 	end
 end