fixed conflict

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

config/puma.rb.save

@@ -1,9 +0,0 @@
-lapplication_path = '/home/superuser/Application/production/sxrestaurant'
-directory application_path
-environment 'production'
-daemonize true
-pidfile "#{application_path}/tmp/pids/puma.pid"
-state_path "#{application_path}/tmp/pids/puma.state"
-stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
-bind 'tcp://0.0.0.0:9292'
-workers 2