Clear conflicts and rewrite puma clause

Author: benoittgt

Gemfile-rails-dependencies

@@ -20,10 +20,10 @@ when /stable$/
   gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
   gem_list << 'activejob'  if version > '4-1-stable'
   gem_list << 'actionview' if version > '4-0-stable'
-  if RUBY_VERSION  >= "1.9.3" && RUBY_VERSION < "2.2"
-    gem "puma", "~> 3.11.4"
-  elsif RUBY_VERSION  >= "2.2"
+  if RUBY_VERSION  >= "2.2"
     gem_list << 'puma' if version > '5-0-stable'
+  elsif RUBY_VERSION >= "1.9.3"
+    gem "puma", "~> 3.11.4"
   end
 
   gem_list.each do |rails_gem|

example_app_generator/generate_app.rb

@@ -23,13 +23,9 @@
   gsub_file "Gemfile", /.*debugger.*/, ''
   gsub_file "Gemfile", /.*byebug.*/, "gem 'byebug', '~> 9.0.6'"
   gsub_file "Gemfile", /.*puma.*/, ""
-<<<<<<< HEAD
   if RUBY_VERSION < '2.2.2'
     gsub_file "Gemfile", /.*rdoc.*/, "gem 'rdoc', '< 6'"
   end
-=======
-  gsub_file "Gemfile", /.*rdoc.*/, "gem 'rdoc', '< 6.0.4'"
->>>>>>> Specify rdoc version when Ruby version is under 2.2 on generated_app
 
   if Rails::VERSION::STRING >= '5.0.0'
     append_to_file('Gemfile', "gem 'rails-controller-testing', :git => 'https://github.com/rails/rails-controller-testing'\n")