fixed conflict

2017-07-03 10:26:26 +06:30
parent 399825b98c dac4c59007
commit 15cbac995f
3 changed files with 3 additions and 11 deletions
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -44,4 +44,5 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # end

 # Allow puma to be restarted by `rails restart` command.
+
 plugin :tmp_restart